From 6a5ea9fd6535b6e483d8499c47f1844e94cdd997 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Tue, 23 Jul 2024 19:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E3=80=81=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E3=80=81=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=89=B9=E6=AC=A1=E3=80=81=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E3=80=81=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=B8=A6=E5=87=BA=E3=80=81bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreceiptRecordMain.data.ts         | 17 ++++++++++++----
 .../customerreceiptRequestMain.data.ts        |  2 +-
 .../customerreturnRecordMain.data.ts          | 20 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
index 976ac1f58..14f139488 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@@ -483,15 +483,15 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '批次',
-    field: 'batch',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '包装代码',
-    field: 'packingNumber',
+    label: '包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -506,7 +506,16 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '数量',
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '收货数量',
     field: 'qty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index 19d5b35c8..a39a9ce07 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -586,7 +586,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTable: false
   },
   {
-    label: '数量',
+    label: '收货数量',
     field: 'qty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index f13024157..3fb569b01 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -523,7 +523,25 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '数量',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '退货数量',
     field: 'qty',
     sort: 'custom',
     table: {