diff --git a/src/api/wms/containerUnbindRecordDetail/index.ts b/src/api/wms/containerUnbindRecordDetail/index.ts new file mode 100644 index 000000000..737f9f0b4 --- /dev/null +++ b/src/api/wms/containerUnbindRecordDetail/index.ts @@ -0,0 +1,57 @@ +import request from '@/config/axios' + +export interface ContainerUnbindRecordDetailVO { + id: number + containerContentType: string + contentNumber: string + itemCode: string + batch: string + inventoryStatus: string + uom: string + qty: number + masterId: number + number: string + siteId: string + remark: string +} + +// 查询器具解绑记录子列表 +export const getContainerUnbindRecordDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/container-unbind-record-detail/senior', data }) + } else { + return await request.get({ url: `/wms/container-unbind-record-detail/page`, params }) + } +} + +// 查询器具解绑记录子详情 +export const getContainerUnbindRecordDetail = async (id: number) => { + return await request.get({ url: `/wms/container-unbind-record-detail/get?id=` + id }) +} + +// 新增器具解绑记录子 +export const createContainerUnbindRecordDetail = async (data: ContainerUnbindRecordDetailVO) => { + return await request.post({ url: `/wms/container-unbind-record-detail/create`, data }) +} + +// 修改器具解绑记录子 +export const updateContainerUnbindRecordDetail = async (data: ContainerUnbindRecordDetailVO) => { + return await request.put({ url: `/wms/container-unbind-record-detail/update`, data }) +} + +// 删除器具解绑记录子 +export const deleteContainerUnbindRecordDetail = async (id: number) => { + return await request.delete({ url: `/wms/container-unbind-record-detail/delete?id=` + id }) +} + +// 导出器具解绑记录子 Excel +export const exportContainerUnbindRecordDetail = async (params) => { + return await request.download({ url: `/wms/container-unbind-record-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/container-unbind-record-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/containerUnbindRecordMain/index.ts b/src/api/wms/containerUnbindRecordMain/index.ts new file mode 100644 index 000000000..4e6849cd6 --- /dev/null +++ b/src/api/wms/containerUnbindRecordMain/index.ts @@ -0,0 +1,69 @@ +import request from '@/config/axios' + +export interface ContainerUnbindRecordMainVO { + id: number + number: string + containerNumber: string + fromWarehouseCode: string + toWarehouseCode: string + outTransactionType: string + inTransactionType: string + executeTime: Date + activeDate: Date + available: string + requestTime: Date + dueTime: Date + departmentCode: string + userGroupCode: string + interfaceType: string + businessType: string + remark: string + extraProperties: string + siteId: string + code: string + fromLocationTypes: string + toLocationTypes: string + fromAreaCodes: string + toAreaCodes: string +} + +// 查询器具解绑记录主列表 +export const getContainerUnbindRecordMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/container-unbind-record-main/senior', data }) + } else { + return await request.get({ url: `/wms/container-unbind-record-main/page`, params }) + } +} + +// 查询器具解绑记录主详情 +export const getContainerUnbindRecordMain = async (id: number) => { + return await request.get({ url: `/wms/container-unbind-record-main/get?id=` + id }) +} + +// 新增器具解绑记录主 +export const createContainerUnbindRecordMain = async (data: ContainerUnbindRecordMainVO) => { + return await request.post({ url: `/wms/container-unbind-record-main/create`, data }) +} + +// 修改器具解绑记录主 +export const updateContainerUnbindRecordMain = async (data: ContainerUnbindRecordMainVO) => { + return await request.put({ url: `/wms/container-unbind-record-main/update`, data }) +} + +// 删除器具解绑记录主 +export const deleteContainerUnbindRecordMain = async (id: number) => { + return await request.delete({ url: `/wms/container-unbind-record-main/delete?id=` + id }) +} + +// 导出器具解绑记录主 Excel +export const exportContainerUnbindRecordMain = async (params) => { + return await request.download({ url: `/wms/container-unbind-record-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/container-unbind-record-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index 8643f50b2..4b05dd042 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -460,14 +460,14 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '包装号', + // field: 'packingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '从包装号', field: 'fromPackingNumber', diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts new file mode 100644 index 000000000..1f06c3998 --- /dev/null +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts @@ -0,0 +1,164 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const ContainerUnbindRecordMainRules = reactive({ +}) + +export const ContainerUnbindRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '器具号', + field: 'containerNumber', + sort: 'custom', + isSearch: true, + }, + { + label: '仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isForm: false, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 表单校验 +export const ContainerUnbindRecordDetailRules = reactive({ + +}) + +export const ContainerUnbindRecordDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '内容物类型', + field: 'containerContentType', + sort: 'custom', + isSearch: true, + form: { + component: 'SelectV2' + }, + table: { + width: 150 + } + }, + { + label: '内容物号', + field: 'contentNumber', + sort: 'custom', + isSearch: true, + table: { + width: 150 + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + table: { + width: 150 + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + isSearch: true, + table: { + width: 150 + } + }, + { + label: '库存状态', + field: 'inventoryStatus', + sort: 'custom', + form: { + component: 'Radio' + }, + table: { + width: 150 + } + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + table: { + width: 150 + }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue new file mode 100644 index 000000000..bdc81db93 --- /dev/null +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue @@ -0,0 +1,285 @@ + + + diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 1d82a833f..c26bf5022 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -167,6 +167,38 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { item.tableForm.disabled = false } } + if(item.field == "toLocationCode"){ + if (toInventoryStatus.value == 'HOLD') { + item.tableForm.searchCondition = [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'type', + value: 'HOLD', + isMainValue: false + }] + } + if (toInventoryStatus.value == 'SCRAP') { + item.tableForm.searchCondition = [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'type', + value: 'SCRAP', + isMainValue: false + }] + }else { + item.tableForm.searchCondition = { + key: 'available', + value: 'TRUE', + isMainValue: false + } + } + } }) // 字段设置 更新主列表字段 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 4ddbadab5..030cf8b62 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -839,9 +839,9 @@ export const InventorymoveRequestDetailRules = reactive({ // toBatch: [ // { required: true, message: '请输入到批次', trigger: 'blur' } // ], - // toLocationCode: [ - // { required: true, message: '请选择到库位代码', trigger: 'change' } - // ], + toLocationCode: [ + { required: true, message: '请选择到库位代码', trigger: 'change' } + ], // toInventoryStatus: [ // { required: true, message: '请选择到库存状态', trigger: 'change' } // ], diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 47beb2fc4..204a64935 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -143,10 +143,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['supplierQty'] = val[0]['supplierQty'] row['supplierUom'] = val[0]['supplierUom'] row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] - row['toLocationCode'] = val[0]['toLocationCode'] - row['fromLocationGroupCode'] = val[0]['locationGroupCode'] - row['toLocationGroupCode'] = val[0]['toLocationGroupCode'] + row['fromLocationCode'] = val[0]['fromLocationCode'] + row['toLocationCode'] = '' + row['fromLocationGroupCode'] = val[0]['fromLocationGroupCode'] + row['toLocationGroupCode'] = '' row['fromAreaCode'] = val[0]['areaCode'] row['toAreaCode'] = val[0]['toAreaCode'] row['fromQwnerCode'] = val[0]['fromQwnerCode'] @@ -177,9 +177,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => item.batch = item.toBatch item.packingNumber = item.toPackingNumber item.containerNumber = item.toContainerNumber - let fromLocationCode = item.fromLocationCode - item.fromLocationCode = item.toLocationCode - item.toLocationCode = fromLocationCode }) isShowButton.value = false PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => { @@ -187,6 +184,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => if (item.field == 'remark') { item.tableForm.disabled = false } + if (item.field == 'qty') { + item.tableForm.disabled = false + } if (item.field == 'reason') { item.tableForm.disabled = false } @@ -330,6 +330,7 @@ const buttonTableClick = async (val, row) => { const formRef = ref() const openForm = async (type: string, row?: number) => { tableData.value = [] // 重置明细数据 + isShowButton.value = true formRef.value.open(type, row) } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 4d0515eb7..b6c99601a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -735,6 +735,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm:false, tableForm:{ disabled:true } @@ -757,6 +758,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm:false, tableForm:{ disabled:true }