From db82f4a6f0d6f5a5febc525776bab5ba9a24c0d7 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 22 Nov 2024 14:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=20=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finishedShipmentMain.data.ts                 | 16 ++++++++++++++++
 .../unfinishedShipmentMain.data.ts               | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
index bd50e7bd5..9e3d5cd5b 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
@@ -164,6 +164,22 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
   // {
   //   label: '发货数量',
   //   field: 'shipmentQuantity',
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
index 92d2548f1..ec741d418 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
@@ -157,6 +157,22 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
   {
     label: '发货数量',
     field: 'shipmentQuantity',