diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index 1157ed240..931b56d86 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue @@ -154,92 +154,109 @@ const butttondata = (row) => { const buttonTableClick = async (val, row) => { if (val == 'mainJobExe') { // 执行 let aaa = { - id: '1809190000221670786', - requestNumber: "REC4620231120-0001", - workShopCode: "222", - fromWarehouseCode: null, - toWarehouseCode: null, - requestTime: 1700449299000, - requestDueTime: 1700448320000, - status: "4", - expiredTime: null, - // updateTime: 1700551119000, - // updater: "1", - priority: null, - priorityIncrement: null, - departmentCode: "研发部门", - acceptUserId: "1", - acceptTime: 1700562156000, - completeUserName: null, - completeTime: null, - fromLocationTypes: "RAW,SEMI", - toLocationTypes: "WIP", - number: "JOB0620231121-0001", - businessType: "Issue", - remark: null, - createTime: 1700551119000, - creator: "1", - fromAreaCodes: "", - toAreaCodes: "", - useOnTheWayLocation: "TRUE", - autoComplete: "FALSE", - allowModifyLocation: "TRUE", - allowModifyQty: "TRUE", - allowBiggerQty: "TRUE", - allowSmallerQty: "TRUE", - allowModifyInventoryStatus: "TRUE", - allowContinuousScanning: "TRUE", - allowPartialComplete: "TRUE", - allowModifyPackingNumber: "FALSE", - allowModifyBatch: "FALSE", - subList: [{ - id: '1809190000965784282', - productionLineCode: "111", - workStationCode: "555", - inventoryStatus: "OK", - onTheWayLocationCode: null, - packingNumber: "12", - containerNumber: "001", - batch: "21", - fromLocationCode: "H03", - toLocationCode: "1", - itemCode: "item01", - itemName: "物品01", - itemDesc1: "", - itemDesc2: "", - stdPackQty: null, - stdPackUnit: null, - supplierQty: null, - supplierUom: null, - projectCode: "xm01", - qty: 50, - uom: "EA", - number: "JOB0620231121-0001", - remark: null, - createTime: 1700550582000, - creator: "1", - fromOwnerCode: null, - toOwnerCode: null, - // updateTime: 1700551119000, - // updater: "1", - recordLst: [{ - handleQty: 10, - toPackingNumber: '12', - toContainerNumber: '001', - toBatch: '21', - toInventoryStatus: 'OK', - toLocationCode: 'H03', - supplierCode: '31213', - },{ - handleQty: 22, - toPackingNumber: 'M20230421000005', - toContainerNumber: '001', - toBatch: '20230808', - toInventoryStatus: 'OK', - toLocationCode: 'SFG', - supplierCode: '31213', - }] - }] + "id": "1809180000625614571", + "issueJobNumber": "JOB0620231121-0001", + "workshopCode": "222", + "fromWarehouseCode": "11", + "toWarehouseCode": "22", + "requestTime": 1700550442000, + "requestDueTime": null, + "status": "2", + "expiredTime": null, + "updateTime": 1700550582000, + "updater": "1", + "jobStageStatus": null, + "priority": null, + "priorityIncrement": null, + "departmentCode": "研发部门", + "acceptUserId": "1", + "acceptTime": 1700737729000, + "completeUserId": null, + "completeTime": null, + "fromLocationTypes": "RAW,SEMI", + "toLocationTypes": "WIP", + "number": "JOB2920231123-0001", + "businessType": "ProductionReceipt", + "remark": null, + "createTime": 1700550581000, + "creator": "1", + "fromAreaCodes": "33", + "toAreaCodes": "44", + "useOnTheWayLocation": "FALSE", + "autoComplete": "FALSE", + "allowModifyLocation": "TRUE", + "allowModifyQty": "TRUE", + "allowBiggerQty": "TRUE", + "allowSmallerQty": "TRUE", + "allowModifyInventoryStatus": "TRUE", + "allowContinuousScanning": "TRUE", + "allowPartialComplete": "TRUE", + "allowModifyBatch": "FALSE", + "allowModifyPackingNumber": "FALSE", + subList: [ + { + "id": "1809180001922347895", + "productionLineCode": "111", + "workStationCode": "555", + "onTheWayLocationCode": "", + "packingNumber": "001", + "containerNumber": "002", + "batch": "003", + "inventoryStatus": "OK", + "fromLocationCode": "H03", + "itemCode": "item01", + "itemName": "物品01", + "itemDesc1": "", + "itemDesc2": "", + "projectCode": "xm01", + "qty": 22, + "uom": "EA", + "number": "JOB2920231123-0001", + "remark": null, + "createTime": 1700550582000, + "creator": "1", + "fromOwnerCode": null, + "toOwnerCode": null, + handleQty: 10, + toPackingNumber: '12', + toContainerNumber: '001', + toBatch: '21', + toInventoryStatus: 'OK', + toLocationCode: 'H03', + supplierCode: 'MRL', + }, + { + "id": "1809180001922347894", + "productionLineCode": "111", + "workStationCode": "555", + "onTheWayLocationCode": "", + "packingNumber": "2222", + "containerNumber": "333", + "batch": "444", + "inventoryStatus": "OK", + "fromLocationCode": "H03", + "itemCode": "item01", + "itemName": "物品01", + "itemDesc1": "", + "itemDesc2": "", + "projectCode": "xm01", + "qty": 10, + "uom": "EA", + "number": "JOB2920231123-0001", + "remark": null, + "createTime": 1700550582000, + "creator": "1", + "fromOwnerCode": null, + "toOwnerCode": null, + handleQty: 10, + toPackingNumber: '12', + toContainerNumber: '001', + toBatch: '21', + toInventoryStatus: 'OK', + toLocationCode: 'H03', + supplierCode: 'MRL', + } +] } ProductionreceiptJobMainApi.executeIssueMain(aaa) } else if (val == 'mainJobAba') { // 放弃 diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts index ab8468586..8d2a731a1 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts @@ -530,16 +530,16 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ } } }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 120, - fixed: 'right' - }, - } + // { + // label: '操作', + // field: 'action', + // isDetail: false, + // isForm: false, + // table: { + // width: 120, + // fixed: 'right' + // }, + // } ])) //表单校验