feat: clarify overseas pallet supplementation

src/modules/overseas-warehouse/api/lastMileOrders.ts

@@ -60,7 +60,7 @@ export interface LastMileOrderSummaryDto {
   transferWarehouseCode?: string | null
   fbaWarehouseCode?: string | null
   containerNo?: string | null
-  containerStatus?: string | null
+  containerNode?: string | null
   abnormal?: boolean | null
   detained?: boolean | null
   holdChargeable?: boolean | null
@@ -229,6 +229,9 @@ export interface ContainerInboundPlanPreviewOrderDto {
   packageCount: number
   volumeCbm: number
   suggestedPalletCount: number | null
+  sourcePalletCount: number
+  targetPalletCount: number
+  supplementPalletCount: number
   plannedPalletCount: number | null
   existingPlanNo: string | null
   planStatus: string | null
@@ -245,6 +248,8 @@ export interface ContainerInboundPlanPreviewGroupDto {
   orderCount: number
   pendingOrderCount: number
   pendingPalletCount: number
+  sourcePalletCount: number
+  supplementPalletCount: number
   existingPlannedPalletCount: number
   suggestedPalletCount: number
   plannedPalletCount: number
@@ -264,6 +269,8 @@ export interface ContainerInboundPlanPreviewDto {
   blockedOrderCount: number
   pendingOrderCount: number
   pendingPalletCount: number
+  sourcePalletCount: number
+  supplementPalletCount: number
   existingPlannedPalletCount: number
   totalSuggestedPalletCount: number
   totalPlannedPalletCount: number

src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts

@@ -71,17 +71,20 @@ const preview = {
   overseasWarehouseId: summary.overseasWarehouseId, overseasWarehouseCode: summary.overseasWarehouseCode,
   overseasWarehouseName: summary.overseasWarehouseName, snapshotVersion: 9, snapshotHash: 'a'.repeat(64),
   totalOrderCount: 5, readyOrderCount: 5, blockedOrderCount: 0, pendingOrderCount: 5,
-  pendingPalletCount: 5, existingPlannedPalletCount: 0, totalSuggestedPalletCount: 5,
+  pendingPalletCount: 5, sourcePalletCount: 4, supplementPalletCount: 1,
+  existingPlannedPalletCount: 0, totalSuggestedPalletCount: 5,
   totalPlannedPalletCount: 0, ready: true,
   groups: [{
     destinationType: 'FBA', destinationWarehouseId: null, destinationWarehouseCode: 'ONT8',
     destinationWarehouseName: 'Ontario FBA', orderCount: 5, pendingOrderCount: 5, pendingPalletCount: 5,
+    sourcePalletCount: 4, supplementPalletCount: 1,
     existingPlannedPalletCount: 0, suggestedPalletCount: 5, plannedPalletCount: 0,
     orders: [{
       customerId, customerName: '测试客户', orderId: '2092873463568596994', businessOrderNo: 'LMO-1',
       inboundCode: 'IN-1', orderType: 'FIRST_LEG', destinationType: 'FBA', destinationWarehouseId: null,
       destinationWarehouseCode: 'ONT8', destinationWarehouseName: 'Ontario FBA', packageCount: 10,
-      volumeCbm: 1, suggestedPalletCount: 5, plannedPalletCount: null, existingPlanNo: null,
+      volumeCbm: 1, suggestedPalletCount: 5, sourcePalletCount: 4, targetPalletCount: 5,
+      supplementPalletCount: 1, plannedPalletCount: null, existingPlanNo: null,
       planStatus: null, orderVersion: 3, readiness: 'READY', blockers: [],
     }],
   }],
@@ -455,7 +458,8 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     await openHiddenContainerWorkbench(wrapper)
     await button(wrapper, '生成入库计划')!.trigger('click')
     await flushPromises()
-    expect(document.body.textContent).toContain('预览已就绪，本次将处理 5 票订单、生成或补齐 5 个托盘码')
+    expect(document.body.textContent).toContain('头程已有 4 个托盘码，海外仓补充 1 个，最终生成 5 个托盘')
+    expect(document.body.textContent).toContain('头程已有 4 托 / 海外仓补充 1 托')
     const confirm = [...document.body.querySelectorAll('button')].find((item) => item.textContent?.includes('确认生成')) as HTMLButtonElement
     expect(confirm.disabled).toBe(false)
     confirm.click()

src/modules/overseas-warehouse/pages/LastMileOrdersView.vue

@@ -834,13 +834,13 @@ onMounted(() => { void load() })
         <div class="container-preview__warehouse text-ellipsis" :title="[containerPreview.overseasWarehouseCode, containerPreview.overseasWarehouseName].filter(Boolean).join(' / ') || '未关联海外仓'">{{ [containerPreview.overseasWarehouseCode, containerPreview.overseasWarehouseName].filter(Boolean).join(' / ') || '未关联海外仓' }}</div>
       </div>
       <div class="container-preview__metrics">
-        <div class="container-preview__metric container-preview__metric--primary"><span>本次新增托盘码</span><strong>{{ containerPreview.pendingPalletCount }}</strong></div>
+        <div class="container-preview__metric"><span>头程已有托盘码</span><strong>{{ containerPreview.sourcePalletCount }}</strong></div>
+        <div class="container-preview__metric container-preview__metric--primary"><span>海外仓补充托盘码</span><strong>{{ containerPreview.supplementPalletCount }}</strong></div>
+        <div class="container-preview__metric"><span>最终生成托盘</span><strong>{{ containerPreview.pendingPalletCount }}</strong></div>
         <div class="container-preview__metric"><span>本次处理订单</span><strong>{{ containerPreview.pendingOrderCount }}</strong></div>
-        <div class="container-preview__metric"><span>已有计划托盘</span><strong>{{ containerPreview.existingPlannedPalletCount }}</strong></div>
-        <div class="container-preview__metric" :class="{ 'container-preview__metric--danger': containerPreview.blockedOrderCount > 0 }"><span>阻断订单</span><strong>{{ containerPreview.blockedOrderCount }}</strong></div>
       </div>
       <el-alert v-if="containerPreview.blockedOrderCount > 0" class="container-convert-alert" type="error" :closable="false" show-icon title="存在阻断订单，暂不可确认生成；请按下方原因处理后重新预览。" />
-      <el-alert v-else-if="!containerConversionResult" class="container-convert-alert" type="success" :closable="false" show-icon :title="`预览已就绪，本次将处理 ${containerPreview.pendingOrderCount} 票订单、生成或补齐 ${containerPreview.pendingPalletCount} 个托盘码。`" />
+      <el-alert v-else-if="!containerConversionResult" class="container-convert-alert" type="success" :closable="false" show-icon :title="`预览已就绪：头程已有 ${containerPreview.sourcePalletCount} 个托盘码，海外仓补充 ${containerPreview.supplementPalletCount} 个，最终生成 ${containerPreview.pendingPalletCount} 个托盘。`" />
       <section v-if="containerConversionResult" class="container-conversion-result">
         <header><strong>生成完成</strong><span>新建 {{ containerConversionResult.newPlanCount }} 个 / 已有 {{ containerConversionResult.existingPlanCount }} 个</span></header>
         <div class="container-conversion-result__plans">
@@ -854,8 +854,8 @@ onMounted(() => { void load() })
       <div class="container-preview__scroll">
         <section v-for="group in containerPreview.groups" :key="`${group.destinationType}-${group.destinationWarehouseId || group.destinationWarehouseCode || 'default'}`" class="container-preview__group">
           <header class="container-preview__group-header">
-            <strong class="text-ellipsis" :title="previewGroupTitle(group)">{{ previewGroupTitle(group) }}：{{ group.pendingPalletCount }}托</strong>
-            <span>本次处理 {{ group.pendingOrderCount }} 票 / 已有 {{ group.existingPlannedPalletCount }} 托 / 共 {{ group.orderCount }} 票</span>
+            <strong class="text-ellipsis" :title="previewGroupTitle(group)">{{ previewGroupTitle(group) }}：最终 {{ group.pendingPalletCount }} 托</strong>
+            <span>头程已有 {{ group.sourcePalletCount }} 托 / 海外仓补充 {{ group.supplementPalletCount }} 托 / 本次处理 {{ group.pendingOrderCount }} 票</span>
           </header>
           <el-table :data="group.orders" size="small" border>
             <el-table-column label="入仓码" min-width="148" show-overflow-tooltip><template #default="{ row }">{{ row.inboundCode || '—' }}</template></el-table-column>
@@ -863,7 +863,9 @@ onMounted(() => { void load() })
             <el-table-column label="客户" min-width="140" show-overflow-tooltip><template #default="{ row }">{{ row.customerName || '—' }}</template></el-table-column>
             <el-table-column label="业务类型" min-width="112" show-overflow-tooltip><template #default="{ row }">{{ orderTypeText(row.orderType) }}</template></el-table-column>
             <el-table-column label="目的地" min-width="190" show-overflow-tooltip><template #default="{ row }">{{ destinationText(row) }}</template></el-table-column>
-            <el-table-column label="建议托数" width="94" align="right"><template #default="{ row }">{{ row.suggestedPalletCount ?? '—' }}</template></el-table-column>
+            <el-table-column label="头程已有" width="94" align="right"><template #default="{ row }">{{ row.sourcePalletCount }}</template></el-table-column>
+            <el-table-column label="海外仓补充" width="102" align="right"><template #default="{ row }">{{ row.supplementPalletCount }}</template></el-table-column>
+            <el-table-column label="最终托数" width="94" align="right"><template #default="{ row }">{{ row.targetPalletCount }}</template></el-table-column>
             <el-table-column label="已有计划托数" width="118" align="right"><template #default="{ row }">{{ row.plannedPalletCount ?? '—' }}</template></el-table-column>
             <el-table-column label="可生成性" width="104"><template #default="{ row }"><el-tag :type="readinessType(row.readiness)" effect="light">{{ readinessText(row.readiness) }}</el-tag></template></el-table-column>
             <el-table-column label="阻断原因" min-width="210" show-overflow-tooltip><template #default="{ row }">{{ blockerText(row.blockers) }}</template></el-table-column>

src/modules/overseas-warehouse/pages/containerPlanPreviewContract.test.ts

@@ -13,7 +13,8 @@ describe('container inbound plan preview contract', () => {
 
   it('renders backend groups, pallet totals, readiness and blockers without local grouping or sorting', () => {
     expect(pageSource).toContain('containerPreview.pendingPalletCount')
-    expect(pageSource).toContain('containerPreview.existingPlannedPalletCount')
+    expect(pageSource).toContain('containerPreview.sourcePalletCount')
+    expect(pageSource).toContain('containerPreview.supplementPalletCount')
     expect(pageSource).toContain('v-for="group in containerPreview.groups"')
     expect(pageSource).toContain('readinessText(row.readiness)')
     expect(pageSource).toContain('blockerText(row.blockers)')