diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 93cdffaa4..475aebf20 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -191,42 +191,42 @@ const butttondata = (row) => { const buttonTableClick = async (val, row) => {  if (val == 'mainJobExe') { // 执行 let aaa = { - "id": 3, - "requestNumber": "REQ1720240326-0012", + "id": 4, + "requestNumber": "REQ1720240401-0001", "deliverPlanNumber": "", - "customerDeliverNumber": "CUST20240326-00000012", - "customerCode": "KHV", - "customerDockCode": "YTV4", + "customerDeliverNumber": "CUST20240401-00000001", + "customerCode": "30003432", + "customerDockCode": "916", "deliverDock": null, "carrierCode": "", "transferMode": "", "vehiclePlateNumber": "", "fromWarehouseCode": null, - "toWarehouseCode": "CKV", - "requestTime": 1711443936000, + "toWarehouseCode": "", + "requestTime": 1711936069000, "requestDueTime": null, - "status": "2", + "status": "1", "expiredTime": null, - "updateTime": 1711443936000, + "updateTime": 1711936069000, "updater": "超级管理员", "jobStageStatus": null, "priority": null, "priorityincrement": null, "departmentCode": "100", - "acceptUserId": "1", - "acceptTime": 1711443941000, + "acceptUserId": null, + "acceptTime": null, "completeUserId": null, "completeTime": null, - "fromAreaTypes": "FG,STOCK_UP", + "fromAreaTypes": "FG,STOCK_UP,SEMI", "toAreaTypes": "CUST,THIRD_PARTY", - "number": "JOB2420240326-0013", + "number": "JOB2420240401-0001", "businessType": "Deliver", "remark": "", - "createTime": 1711443936000, + "createTime": 1711936069000, "creator": "超级管理员", "ruleUserId": null, - "fromAreaCodes": "FG", - "toAreaCodes": "CUST,ZTQ", + "fromAreaCodes": "", + "toAreaCodes": "", "fromDockCode": null, "autoComplete": "FALSE", "allowModifyLocation": "FALSE", @@ -241,44 +241,43 @@ const buttonTableClick = async (val, row) => { "inInventoryStatuses": "OK", "outInventoryStatuses": "OK", "concurrencyStamp": 1, - "useOnTheWayLocation": null, "subList": [{ - "id": 3, + "id": 6, "soNumber": null, "soLine": null, "packingNumber": null, - "batch": "2024021801", + "batch": "20240329", "inventoryStatus": "OK", "ownerCode": null, "containerNumber": null, - "fromLocationCode": "FG", - "toLocationCode": "SFK", - "itemCode": "vvcs-zhj1", - "itemName": "测试物件", - "itemDesc1": "水冷系-散热器", - "itemDesc2": "水冷系-散热器", - "projectCode": "PJ001", - "qty": 11, - "uom": "PC", - "number": "JOB2420240326-0013", + "fromLocationCode": "W70-240-10", + "toLocationCode": "3041", + "itemCode": "399.960-12", + "itemName": "远光内侧反射镜(镀铝)右灯", + "itemDesc1": null, + "itemDesc2": null, + "projectCode": null, + "qty": 1, + "uom": "EA", + "number": "JOB2420240401-0001", "remark": "", - "createTime": 1711443936000, + "createTime": 1711936070000, "creator": "超级管理员", "toPackingNumber": null, "toContainerNumber": null, "toBatch": null, "handleQty": null, "toInventoryStatus": null, - "updateTime": 1711443936000, + "updateTime": 1711936070000, "updater": "超级管理员", - "onTheWayLocationCode": "FHZTK", + "onTheWayLocationCode": "914", recordList: [{ - handleQty: 11, + handleQty: 1, toPackingNumber: null, toContainerNumber: null, - toBatch: '2024021801', + toBatch: '20240329', toInventoryStatus: 'OK', - toLocationCode: "SFK", + toLocationCode: "3041", supplierCode: '31213', }] } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index fcb7b4b31..16eb1f6d7 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -213,15 +213,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '发货库区类型', - field: 'deliverType', - sort: 'custom', - dictType: DICT_TYPE.DELIVER_TYPE, - table: { - width: 150 - }, - }, { label: '车牌号', field: 'vehiclePlateNumber',