From 52dd5a0981b19e13ff31671ebfde9bc9422d3748 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 25 Apr 2024 13:47:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=BB=E9=A1=B5=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=9A=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=95=B0=E9=87=8F=EF=BC=8C=E7=BB=91=E5=AE=9A=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=BAqty=EF=BC=8C=E4=BB=8E=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=94=B9=E4=B8=BA=EF=BC=9A=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=94=B9=E4=B8=BA=EF=BC=9A=E7=9B=AE=E6=A0=87=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptJobMain.data.ts              | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index e09c3055c..acbec7612 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -610,8 +610,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
-    field: 'toPackingNumber',
+    label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
+    field: 'toBatch',
     sort: 'custom',
     isForm:false,
     isTableForm:false,
@@ -621,8 +621,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:1001,
   },
   {
-    label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
-    field: 'toBatch',
+    label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
+    field: 'toPackingNumber',
     sort: 'custom',
     isForm:false,
     isTableForm:false,
@@ -631,6 +631,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:1001,
   },
+  
 ]))
 
 //表单校验
@@ -809,7 +810,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '从库位代码',
+    label: '来源库位',
     field: 'fromLocationCode',
     sort: 'custom',
     table: {
@@ -818,7 +819,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:1005
   },
   {
-    label: '到库位代码',
+    label: '目标库位',
     field: 'toLocationCode',
     sort: 'custom',
     table: {
@@ -846,7 +847,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '包装数量',
-    field: 'packQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -1309,7 +1310,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(reactive<Cru
     }
   },
   {
-    label: '包装数量',
+    label: '包装数量1',
     field: 'packQty',
     sort: 'custom',
     table: {

From b5fe5f8bfff3e5b7b2090836c012d147724a1bd6 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 25 Apr 2024 14:22:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index b0e0a87fc..bca93fa19 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -206,6 +206,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
   },
   {
     label: '是否可用',