From 3a4689cfd17acf984f360f1d81af0bfc01bf50d9 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 19 Dec 2023 12:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7=20?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverRequestMain.data.ts                |  3 ++
 .../inventorymoveJobMain/index.vue            | 34 +++++++++----------
 .../inventorymoveJobMain.data.ts              |  2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index ca38f0176..3bb821590 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -527,6 +527,9 @@ export const DeliverRequestMainRules = reactive({
   // toLocationTypes: [
   //   { required: true, message: '请选择到库位类型范围', trigger: 'change' }
   // ],
+  deliverPlanNumber: [
+    { required: true, message: '请选择发货计划单号', trigger: 'change' }
+  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
index f85ac4b65..ad83d263e 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -186,16 +186,16 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
     console.log('列表-操作按钮事件-执行')
     let aaa = {
-    "id": 3,
-    "requestNumber": "REQ3720231215-0003",
+    "id": 6,
+    "requestNumber": "REQ3720231218-0003",
     "useOnTheWayLocation": "TRUE",
     "fromWarehouseCode": "W1",
-    "requestTime": 1702604632000,
-    "requestDueTime": 1703952000000,
+    "requestTime": 1702868002000,
+    "requestDueTime": 1702867958000,
     "status": "1",
-    "expiredTime": 1703952000000,
-    "updateTime": 1702607543000,
-    "updater": "1",
+    "expiredTime": 1702867958000,
+    "updateTime": 1702868310000,
+    "updater": "超级管理员",
     "jobStageStatus": null,
     "priority": null,
     "priorityIncrement": null,
@@ -206,11 +206,11 @@ const buttonTableClick = async (val, row) => {
     "completeTime": null,
     "fromLocationTypes": "SCRAP",
     "toLocationTypes": "SCRAP",
-    "number": "JOB1120231215-0005",
+    "number": "JOB1120231218-0003",
     "businessType": "OkToHoldJob",
-    "remark": "主备注",
-    "createTime": 1702607543000,
-    "creator": "1",
+    "remark": "主",
+    "createTime": 1702868310000,
+    "creator": "超级管理员",
     "creatorName": null,
     "toWarehouseCode": "W1",
     "fromAreaCodes": "L-R-001",
@@ -225,8 +225,8 @@ const buttonTableClick = async (val, row) => {
     "allowPartialComplete": "TRUE",
     "allowModifyBatch": "FALSE",
     "allowModifyPackingNumber": "FALSE",
-    subList: [{
-    "id": "1809190000225116835",
+    "subList": [{
+    "id": "1809190000225116838",
     "itemCode": "testCF",
     "itemName": "陈放测试物品",
     "itemDesc1": "测试用",
@@ -234,10 +234,10 @@ const buttonTableClick = async (val, row) => {
     "projectCode": "5",
     "qty": 1,
     "uom": "EA",
-    "number": "JOB1120231215-0005",
-    "remark": "子备注",
-    "createtime": null,
-    "creator": "1",
+    "number": "JOB1120231218-0003",
+    "remark": "子",
+    "createTime": 1702868310000,
+    "creator": "超级管理员",
     "packingNumber": "testCF",
     "containerNumber": null,
     "batch": "20230808",
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index 77c6abcac..2328ea65c 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -760,7 +760,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '创建时间',
-    field: 'createtime',
+    field: 'createTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'