From 2ab075f095fc03ddb55234754fa7d4d5b220050b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=84=A6=E9=BE=99=E8=A8=80?= <jiaolongyan@wondersgroup.com>
Date: Mon, 27 Jul 2026 11:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=A1=A5=E5=85=A8?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E8=BF=BD=E6=BA=AF=E4=BD=8D=E7=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scripts/verify-business-contract.mjs      | 19 +++++++++++++++++--
 .../src/views/report/palletTrace/index.vue    | 13 +++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/shierfeng-fastapi-frontend/scripts/verify-business-contract.mjs b/shierfeng-fastapi-frontend/scripts/verify-business-contract.mjs
index f9af49e..4ad1040 100644
--- a/shierfeng-fastapi-frontend/scripts/verify-business-contract.mjs
+++ b/shierfeng-fastapi-frontend/scripts/verify-business-contract.mjs
@@ -323,8 +323,10 @@ const reportPageContracts = {
     queryKeys: ['pageNum', 'pageSize', 'beginTime', 'endTime', 'palletCode', 'eventType'],
     columnKeys: [
       'occurredAt', 'eventType', 'sourceType', 'sourceId', 'palletCode',
-      'beforeState', 'afterState', 'beforeWarehouseName', 'beforeSiteName',
-      'beforeLineName', 'afterWarehouseName', 'afterSiteName', 'afterLineName',
+      'beforeState', 'afterState', 'beforeWarehouseName', 'beforeWarehouseId',
+      'beforeSiteName', 'beforeSiteId', 'beforeLineName', 'beforeLineId',
+      'afterWarehouseName', 'afterWarehouseId', 'afterSiteName', 'afterSiteId',
+      'afterLineName', 'afterLineId',
       'beforeRemainingPackages', 'afterRemainingPackages', 'operatorName'
     ]
   }
@@ -785,6 +787,19 @@ test('六个只读报表页面逐页满足 API、权限、筛选、列和异步
         assert.match(source, new RegExp(`\\b${columnKey}\\b`), `${resource} 缺少核心列 ${columnKey}`)
       }
 
+      if (resource === 'palletTrace') {
+        assert.match(
+          source,
+          /formatLocation\(\s*scope\.row\.beforeWarehouseName,\s*scope\.row\.beforeWarehouseId,\s*scope\.row\.beforeSiteName,\s*scope\.row\.beforeSiteId,\s*scope\.row\.beforeLineName,\s*scope\.row\.beforeLineId\s*\)/,
+          'palletTrace 变更前位置必须同时传入仓库、现场和产线的名称与 ID'
+        )
+        assert.match(
+          source,
+          /formatLocation\(\s*scope\.row\.afterWarehouseName,\s*scope\.row\.afterWarehouseId,\s*scope\.row\.afterSiteName,\s*scope\.row\.afterSiteId,\s*scope\.row\.afterLineName,\s*scope\.row\.afterLineId\s*\)/,
+          'palletTrace 变更后位置必须同时传入仓库、现场和产线的名称与 ID'
+        )
+      }
+
       assert.match(source, /<el-date-picker\b[\s\S]*?type="daterange"[\s\S]*?value-format="YYYY-MM-DD"/)
       assert.match(source, /<el-table\b[^>]*v-loading="loading"[^>]*:data="reportList"/)
       assert.match(source, /<template\s+#empty>[\s\S]*?<el-empty\b/)
diff --git a/shierfeng-fastapi-frontend/src/views/report/palletTrace/index.vue b/shierfeng-fastapi-frontend/src/views/report/palletTrace/index.vue
index 0ea34dc..0164014 100644
--- a/shierfeng-fastapi-frontend/src/views/report/palletTrace/index.vue
+++ b/shierfeng-fastapi-frontend/src/views/report/palletTrace/index.vue
@@ -35,12 +35,12 @@
       <el-table-column label="变更后状态" prop="afterState" min-width="140" />
       <el-table-column label="变更前位置" min-width="180" :show-overflow-tooltip="true">
         <template #default="scope">
-          {{ locationLabel(scope.row.beforeWarehouseName, scope.row.beforeSiteName, scope.row.beforeLineName) }}
+          {{ formatLocation(scope.row.beforeWarehouseName, scope.row.beforeWarehouseId, scope.row.beforeSiteName, scope.row.beforeSiteId, scope.row.beforeLineName, scope.row.beforeLineId) }}
         </template>
       </el-table-column>
       <el-table-column label="变更后位置" min-width="180" :show-overflow-tooltip="true">
         <template #default="scope">
-          {{ locationLabel(scope.row.afterWarehouseName, scope.row.afterSiteName, scope.row.afterLineName) }}
+          {{ formatLocation(scope.row.afterWarehouseName, scope.row.afterWarehouseId, scope.row.afterSiteName, scope.row.afterSiteId, scope.row.afterLineName, scope.row.afterLineId) }}
         </template>
       </el-table-column>
       <el-table-column label="变更前数量" prop="beforeRemainingPackages" width="110" align="right" />
@@ -97,8 +97,13 @@ function sourceLabel(sourceType, sourceId) {
   return sourceType ? `${sourceType} #${sourceId}` : '—'
 }
 
-function locationLabel(warehouseName, siteName, lineName) {
-  return [warehouseName, siteName, lineName].filter(Boolean).join(' / ') || '—'
+function formatLocation(warehouseName, warehouseId, siteName, siteId, lineName, lineId) {
+  const locations = [
+    warehouseName || (warehouseId === undefined || warehouseId === null ? undefined : `仓库#${warehouseId}`),
+    siteName || (siteId === undefined || siteId === null ? undefined : `现场#${siteId}`),
+    lineName || (lineId === undefined || lineId === null ? undefined : `产线#${lineId}`)
+  ]
+  return locations.filter(Boolean).join(' / ') || '—'
 }
 
 function invalidateListRequest() {