Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test

src/modules/unified-orders/api/unifiedOrders.test.ts

@@ -69,11 +69,11 @@ describe('unified orders API contract', () => {
 
   it('normalizes C02 row IDs and keeps inboundId for measurement routing', async () => {
     vi.mocked(http.get).mockResolvedValue({ data: {
-      records: [{ orderId: '90001', tenantId: '208', inboundId: '77', inboundVersion: 3, mainStatus: 'WAIT_MEASURE', customerRemark: '客户备注', latestInternalNote: '最新内部备注', measurement: null, preload: null, loading: null, delivery: null, transport: null }],
+      records: [{ orderId: '90001', tenantId: '208', inboundId: '77', inboundVersion: 3, mainStatus: 'WAIT_MEASURE', recommendedPalletType: 'STANDARD', locationCodes: 'A0-01, B2-03', customerRemark: '客户备注', latestInternalNote: '最新内部备注', measurement: null, preload: null, loading: null, delivery: null, transport: null }],
       page: 1, size: 20, total: 1, pages: 1,
     } })
     await expect(listPlatformUnifiedOrders({ page: 1, size: 20 })).resolves.toMatchObject({
-      records: [{ orderId: '90001', tenantId: '208', inboundId: '77', inboundVersion: 3, customerRemark: '客户备注', latestInternalNote: '最新内部备注' }],
+      records: [{ orderId: '90001', tenantId: '208', inboundId: '77', inboundVersion: 3, recommendedPalletType: 'STANDARD', locationCodes: 'A0-01, B2-03', customerRemark: '客户备注', latestInternalNote: '最新内部备注' }],
     })
   })
 

src/modules/unified-orders/api/unifiedOrders.ts

@@ -105,6 +105,9 @@ export interface UnifiedOrderResource {
   taxMode?: string | null
   fullContainer?: boolean | null
   customsInspection?: boolean | null
+  recommendedPalletType?: string | null
+  locationCodes?: string | null
+  /** Legacy aliases retained while older order responses are still deployed. */
   totalPalletCount?: number | null
   chargeableVolumeCbm?: number | null
   volumetricWeightKg?: number | null
@@ -317,6 +320,9 @@ function normalizeRow(raw: UnifiedOrderResource): UnifiedOrderResource {
     inboundId: id(raw.inboundId),
     inboundVersion: nullableInteger(raw.inboundVersion),
     totalPackageCount: nullableInteger(raw.totalPackageCount),
+    totalPalletCount: nullableInteger(raw.totalPalletCount),
+    recommendedPalletType: raw.recommendedPalletType ?? null,
+    locationCodes: raw.locationCodes ?? raw.location ?? null,
     measurement: raw.measurement ? {
       ...raw.measurement,
       actualGrossWeightKg: numberValue(raw.measurement.actualGrossWeightKg),

src/modules/unified-orders/pages/UnifiedOrdersView.vue

@@ -230,8 +230,8 @@ const columns: DataTableColumn[] = [
   { key: 'chargeableWeightKg', prop: 'chargeableWeightKg', label: '计费毛重', minWidth: 120, slotName: 'field' },
   { key: 'totalVolumeCbm', prop: 'totalVolumeCbm', label: '总体积(m³)', minWidth: 120, slotName: 'field' },
   { key: 'chargeableVolumeCbm', prop: 'chargeableVolumeCbm', label: '计费体积(m³)', minWidth: 130, slotName: 'field' },
-  { key: 'totalPalletCount', prop: 'totalPalletCount', label: '总托盘数', minWidth: 110, slotName: 'field' },
-  { key: 'location', prop: 'location', label: '库位位置', minWidth: 130, slotName: 'field' },
+  { key: 'recommendedPalletType', prop: 'recommendedPalletType', label: '推荐托盘类型', minWidth: 130, slotName: 'field' },
+  { key: 'locationCodes', prop: 'locationCodes', label: '库位位置', minWidth: 130, slotName: 'field' },
   { key: 'volumetricWeightKg', prop: 'volumetricWeightKg', label: '总材积重', minWidth: 120, slotName: 'field' },
   { key: 'totalNetWeightKg', prop: 'totalNetWeightKg', label: '总净重(T.K.NW)', minWidth: 140, slotName: 'field' },
   { key: 'destinationType', prop: 'destinationType', label: '目的仓类型', minWidth: 130, slotName: 'field' },
@@ -877,7 +877,7 @@ onMounted(() => {
                 <div><dt>是否整柜</dt><dd>{{ firstLegContainerModeLabel(detail.order.order?.containerMode) }}</dd></div>
                 <div><dt>商检验</dt><dd>{{ displayBoolean(detail.order.order?.customsInspection) }}</dd></div>
                 <div><dt>总箱数</dt><dd>{{ detail.summary.totalPackageCount ?? '—' }} 箱</dd></div>
-                <div><dt>总托盘数</dt><dd>{{ detail.summary.totalPalletCount ?? '—' }}</dd></div>
+                <div><dt>推荐托盘类型</dt><dd>{{ detail.summary.recommendedPalletType || '—' }}</dd></div>
                 <div><dt>总毛重</dt><dd>{{ formatNumber(cargoTotal(detail.order.cargoes, 'grossWeightKg') ?? detail.summary.measurement?.actualGrossWeightKg) }} kg</dd></div>
                 <div><dt>总净重</dt><dd>{{ formatNumber(cargoTotal(detail.order.cargoes, 'netWeightKg')) }} kg</dd></div>
                 <div><dt>总体积</dt><dd>{{ formatNumber(cargoTotal(detail.order.cargoes, 'volumeCbm') ?? detail.summary.measurement?.actualVolumeCbm, 3) }} m³</dd></div>
@@ -885,7 +885,7 @@ onMounted(() => {
                 <div><dt>计费体积</dt><dd>{{ formatNumber(detail.summary.chargeableVolumeCbm, 3) }} m³</dd></div>
                 <div><dt>总材积重</dt><dd>{{ formatNumber(detail.summary.volumetricWeightKg) }} kg</dd></div>
                 <div><dt>总材积量</dt><dd>{{ formatNumber(detail.summary.volumetricWeightKg) }}</dd></div>
-                <div><dt>库位位置</dt><dd>{{ detail.summary.location || '—' }}</dd></div>
+                <div><dt>库位位置</dt><dd>{{ detail.summary.locationCodes || '—' }}</dd></div>
                 <div><dt>创建时间</dt><dd>{{ formatDate(detail.summary.createdAt) }}</dd></div>
                 <div><dt>入库完成时间</dt><dd>{{ formatDate(detail.summary.inboundCompletedAt) }}</dd></div>
                 <div><dt>测量完成时间</dt><dd>{{ formatDate(detail.summary.measurementCompletedAt || detail.summary.measurement?.completedAt) }}</dd></div>