From 8da5c12dfc11dd0ed40bc83c4821cac5360308f8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 19 May 2026 08:58:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E7=BB=9F=E8=AE=A1=E5=95=86=E5=93=81=E7=BB=B4=E5=BA=A6?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 对齐商品维度列字段为 itemId、skuId、skuWarehouseId
- 同步 antd/ele 的 spanMethod 合并字段
- 补充 WMS 迁移验证记录
---
 apps/web-antd/src/views/wms/inventory/index/data.ts   | 4 ++--
 apps/web-antd/src/views/wms/inventory/index/index.vue | 2 +-
 apps/web-ele/src/views/wms/inventory/index/data.ts    | 4 ++--
 apps/web-ele/src/views/wms/inventory/index/index.vue  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/wms/inventory/index/data.ts b/apps/web-antd/src/views/wms/inventory/index/data.ts
index 90479ca7a..40cfa3acf 100644
--- a/apps/web-antd/src/views/wms/inventory/index/data.ts
+++ b/apps/web-antd/src/views/wms/inventory/index/data.ts
@@ -140,7 +140,7 @@ const warehouseDimensionColumns: VxeTableGridOptions['columns'] = [
 
 const itemDimensionColumns: VxeTableGridOptions['columns'] = [
   {
-    field: 'warehouseItemId',
+    field: 'itemId',
     title: '商品信息',
     minWidth: 240,
     slots: { default: 'itemInfo' },
@@ -152,7 +152,7 @@ const itemDimensionColumns: VxeTableGridOptions['columns'] = [
     slots: { default: 'skuInfo' },
   },
   {
-    field: 'warehouseId',
+    field: 'skuWarehouseId',
     title: '仓库',
     minWidth: 160,
     slots: { default: 'warehouseName' },
diff --git a/apps/web-antd/src/views/wms/inventory/index/index.vue b/apps/web-antd/src/views/wms/inventory/index/index.vue
index 2e227c81a..64d6fcf14 100644
--- a/apps/web-antd/src/views/wms/inventory/index/index.vue
+++ b/apps/web-antd/src/views/wms/inventory/index/index.vue
@@ -66,7 +66,7 @@ function getRowPropertyValue(row: InventoryRow | undefined, property: string) {
 /** 根据统计维度返回需要合并单元格的字段 */
 function getRowSpanProperties() {
   if (currentDimension.value === INVENTORY_DIMENSION.ITEM) {
-    return ['warehouseItemId', 'skuId', 'skuWarehouseId'];
+    return ['itemId', 'skuId', 'skuWarehouseId'];
   }
   return ['warehouseId', 'warehouseItemId'];
 }
diff --git a/apps/web-ele/src/views/wms/inventory/index/data.ts b/apps/web-ele/src/views/wms/inventory/index/data.ts
index 27c8cc359..124051866 100644
--- a/apps/web-ele/src/views/wms/inventory/index/data.ts
+++ b/apps/web-ele/src/views/wms/inventory/index/data.ts
@@ -138,7 +138,7 @@ const warehouseDimensionColumns: VxeTableGridOptions['columns'] = [
 
 const itemDimensionColumns: VxeTableGridOptions['columns'] = [
   {
-    field: 'warehouseItemId',
+    field: 'itemId',
     title: '商品信息',
     minWidth: 240,
     slots: { default: 'itemInfo' },
@@ -150,7 +150,7 @@ const itemDimensionColumns: VxeTableGridOptions['columns'] = [
     slots: { default: 'skuInfo' },
   },
   {
-    field: 'warehouseId',
+    field: 'skuWarehouseId',
     title: '仓库',
     minWidth: 160,
     slots: { default: 'warehouseName' },
diff --git a/apps/web-ele/src/views/wms/inventory/index/index.vue b/apps/web-ele/src/views/wms/inventory/index/index.vue
index 0613ec284..79d70d975 100644
--- a/apps/web-ele/src/views/wms/inventory/index/index.vue
+++ b/apps/web-ele/src/views/wms/inventory/index/index.vue
@@ -66,7 +66,7 @@ function getRowPropertyValue(row: InventoryRow | undefined, property: string) {
 /** 根据统计维度返回需要合并单元格的字段 */
 function getRowSpanProperties() {
   if (currentDimension.value === INVENTORY_DIMENSION.ITEM) {
-    return ['warehouseItemId', 'skuId', 'skuWarehouseId'];
+    return ['itemId', 'skuId', 'skuWarehouseId'];
   }
   return ['warehouseId', 'warehouseItemId'];
 }