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

src/deployment/nginxConfig.test.ts

@@ -39,8 +39,11 @@ describe('admin nginx deployment config', () => {
   })
 
   it('declares an explicit overseas gateway upstream in container deployments', () => {
-    expect(testCompose).toContain('API_UPSTREAM: "http://test-api-cn.buggoglobal.com"')
-    expect(testCompose).toContain('OVERSEAS_API_UPSTREAM: "http://test-api-global.buggoglobal.com"')
+    expect(testCompose).toContain('- "host.docker.internal:host-gateway"')
+    expect(testCompose).toContain('API_UPSTREAM: "${API_UPSTREAM:-http://host.docker.internal:9000}"')
+    expect(testCompose).toContain('OVERSEAS_API_UPSTREAM: "${OVERSEAS_API_UPSTREAM:-http://host.docker.internal:9300}"')
+    expect(testCompose).not.toContain('http://test-api-cn.buggoglobal.com')
+    expect(testCompose).not.toContain('http://test-api-global.buggoglobal.com')
     expect(testCompose).toContain('CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://test-app.buggoglobal.com/}"')
     expect(testCompose).not.toContain('CLIENT_WEB_URL: "http://8.163.')
     expect(developmentCompose).toContain('CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://dev-app.buggoglobal.com/}"')

src/modules/overseas-warehouse/AGENTS.md

@@ -29,6 +29,8 @@
 
 ## 履约硬边界
 
+- 智能排车来源支持 `RELABEL`（待出库换标单），切换后不传已选入库计划 ID，按客户已确认、卡车派送且未排车的换标库存查询。提交换标号从候选 `orderRefs` 读取，不能把展示的原入库单号 `orderNo` 当换标号；沿用来源库存、托盘与箱唛，不生成新入库单。
+
 - 托盘管理单张打印：`pages/PalletsView.vue` 每行“打印”经 `api/pallets.ts` 的 `getPalletLabelPdf` 下载当前托盘一页 PDF；使用该行仓库 ID 与托盘 ID，权限复用托盘列表。Backend `warehouse-overseas-service` 的 `PalletLabelPrintService` 读取公共托盘；有 FBA 仓码的托盘与国内统一使用 Print `FBA_PALLET_A4_LANDSCAPE_V1`（297×210 mm，FBA 仓码、完整托盘号 Code 128、托盘号文字），其他托盘使用 `INBOUND_MARK_V1`。不在前端生成标签、改码或维护第二套模板。
 
 - API 为 `api/dispatches.ts`、`api/outbounds.ts`、`api/deliveryOrders.ts`；Backend `lastleg-service/dispatch/`、`delivery/`、`dropship/`。一件代发独立出库，从服务端库存位置选择并携带幂等键；普通出库及换标单经头程排车转出库，按托盘快照绑定头程箱唛，PDA 按托盘作业，详情展示箱唛与已拣数量；排车转派送按稳定 `dispatchNo` 进入服务端命令，可在 `PENDING_DEPARTURE`、`PICKING`、`READY_TO_DEPART` 状态执行并须在 PDA 发车前生成一张待出库单及按目的 FBA 仓拆分的派送单

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

@@ -33,6 +33,10 @@ export interface DeliveryOrderRow {
   destinationWarehouseId?: string | null
   destinationWarehouseCode?: string | null
   destinationWarehouseName?: string | null
+  destinationType?: 'FBA' | 'PRIVATE' | null
+  deliveryAddress?: string | null
+  contactName?: string | null
+  contactPhone?: string | null
   overseasWarehouseId?: string | null
   overseasWarehouseName?: string | null
   status: string

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

@@ -39,13 +39,18 @@ export interface DispatchPalletCandidateDto {
   sourceStage?: 'PLAN' | 'RECEIVED' | 'RELABEL' | null
   cartonMarks?: string | null
   relabelCartonMarks?: string | null
+  destinationType?: 'FBA' | 'PRIVATE' | null
+  deliveryAddress?: string | null
+  postalCode?: string | null
+  contactName?: string | null
+  contactPhone?: string | null
 }
 
 export interface DispatchCandidateQuery {
   planIds?: string
   orderNo?: string
   fbaWarehouseCode?: string
-  sourceStage?: 'PLAN' | 'RECEIVED'
+  sourceStage?: 'PLAN' | 'RECEIVED' | 'RELABEL'
   draftToken?: string
 }
 export interface DispatchDraftContainerDto { id: string; capacity: number; palletIds: string[] }

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

@@ -71,6 +71,8 @@ export interface LastMileOrderSummaryDto {
   version?: number | null
   palletCount?: number | null
   packageCount?: number | null
+  receivedPackageCount?: number | null
+  packageDifference?: number | null
   volumeCbm?: number | null
   productQuantity?: number | null
   volumeWeightKg?: number | null

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

@@ -20,6 +20,8 @@ export interface OutboundDetail { outbound: OutboundRow; pallets?: OutboundPalle
 export interface OutboundQuery { page: number; size: number; documentNo?: string; lxCode?: string; warehouseId?: string; status?: string; outboundType?: string }
 export interface ReturnOutboundCandidate { returnNo?: string | null; overseasWarehouseId?: string | null; cartonMark?: string | null; fbaCartonMark?: string | null; destinationWarehouseCode?: string | null; destinationWarehouseName?: string | null; totalQuantity?: number | null; status?: string | null }
 export interface OneClickOutboundCandidate { inventoryPositionId: string; orderNo?: string | null; customerId?: string | null; customerName?: string | null; overseasWarehouseId?: string | null; overseasWarehouseName?: string | null; palletNo?: string | null; inboundCode?: string | null; skuCode?: string | null; productName?: string | null; availablePackages: number }
+export interface WarehouseTransferOutboundCandidate { customerId: string; customerName?: string | null; transferNo: string; overseasWarehouseId: string; transferStatus: string; needRelabel: boolean; relabelNo?: string | null; destinationType?: 'FBA' | 'PRIVATE' | null; destinationWarehouseCode?: string | null; privateDestinationAddress?: string | null; privateDestinationPostalCode?: string | null; packageCount: number; grossWeightKg?: number | null; volumeCbm?: number | null }
+export interface WarehouseTransferDestinationPayload { transfers: Array<{ customerId: string; transferNo: string }>; destinationType: 'FBA' | 'PRIVATE'; destinationWarehouseId?: string; destinationWarehouseCode?: string; destinationWarehouseName?: string; privateDestinationAddress?: string; privateDestinationPostalCode?: string; privateDestinationContactName?: string; privateDestinationContactPhone?: string; idempotencyKey: string }
 export async function listOutbounds(query: OutboundQuery) {
   const response = await overseasHttp.get<ApiEnvelope<OverseasPagePayload<OutboundRow>>, ApiEnvelope<OverseasPagePayload<OutboundRow>>>('/platform/v1/last-leg/outbound-orders', { params: query })
   return normalizeOverseasPage(unwrapApiResponse(response))
@@ -44,6 +46,14 @@ export async function createReturnOutbound(customerId: string, payload: { recipi
   const response = await overseasHttp.post<ApiEnvelope<OutboundRow>, ApiEnvelope<OutboundRow>>('/platform/v1/last-leg/outbound-orders/return', payload, { params: { customerId } })
   return unwrapApiResponse(response)
 }
+export async function listWarehouseTransferOutboundCandidates(query: { customerId?: string; warehouseId?: string } = {}) {
+  const response = await overseasHttp.get<ApiEnvelope<WarehouseTransferOutboundCandidate[]>, ApiEnvelope<WarehouseTransferOutboundCandidate[]>>('/platform/v1/last-leg/outbound-orders/warehouse-transfer/candidates', { params: query })
+  return unwrapApiResponse(response).map(item => ({ ...item, packageCount: Number(item.packageCount || 0) }))
+}
+export async function bindWarehouseTransferDestination(payload: WarehouseTransferDestinationPayload) {
+  const response = await overseasHttp.post<ApiEnvelope<unknown[]>, ApiEnvelope<unknown[]>>('/platform/v1/last-leg/warehouse-transfers/bind-destination', payload)
+  return unwrapApiResponse(response)
+}
 export async function cancelOutbound(outboundNo: string, reason: string) {
   const response = await overseasHttp.post<ApiEnvelope<null>, ApiEnvelope<null>>(`/platform/v1/last-leg/outbound-orders/${encodeURIComponent(outboundNo)}/cancel`, { reason })
   return unwrapApiResponse(response)

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

@@ -167,6 +167,14 @@ export async function returnRelabelForRework(relabelNo: string, expectedVersion:
   return unwrapApiResponse(response)
 }
 
+export async function confirmRelabelCompletion(relabelNo: string, remark?: string) {
+  const response = await overseasHttp.post<ApiEnvelope<unknown>, ApiEnvelope<unknown>>(
+    `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/confirm-completion`,
+    { idempotencyKey: crypto.randomUUID(), remark },
+  )
+  return unwrapApiResponse(response)
+}
+
 export async function uploadRelabelPdf(relabelNo: string, file: File, scope: 'TOTAL' | 'ITEM', itemId?: string) {
   const body = new FormData()
   body.append('file', file)

src/modules/overseas-warehouse/components/SmartDispatchDialog.vue

@@ -47,7 +47,7 @@ const selectedVehicle = ref('')
 const query = reactive({
   orderNo: '',
   orderType: '',
-  sourceStage: 'RECEIVED' as '' | 'PLAN' | 'RECEIVED',
+  sourceStage: 'RECEIVED' as '' | 'PLAN' | 'RECEIVED' | 'RELABEL',
   fbaWarehouseCode: '',
 })
 const warehouseTab = ref<'ALL' | 'LAX' | 'NYC'>('ALL')
@@ -105,6 +105,10 @@ function number(value: unknown, digits = 0) {
 function dateTime(value: unknown) {
   return formatOverseasDateTime(value)
 }
+function privateWarehouse(item: DispatchPalletCandidateDto) {
+  if (item.destinationType !== 'PRIVATE') return '—'
+  return [item.deliveryAddress, item.postalCode].map((value) => String(value || '').trim()).filter(Boolean).join(' · ') || '—'
+}
 function orderType(value: unknown) {
   return (
     (
@@ -158,7 +162,7 @@ async function load() {
   loadError.value = null
   try {
     candidates.value = await listDispatchCandidates({
-      planIds: planIds.value.length ? planIds.value.join(',') : undefined,
+      planIds: query.sourceStage !== 'RELABEL' && planIds.value.length ? planIds.value.join(',') : undefined,
       orderNo: query.orderNo.trim() || undefined,
       fbaWarehouseCode: query.fbaWarehouseCode.trim() || undefined,
       sourceStage: query.sourceStage || undefined,
@@ -295,7 +299,11 @@ async function submit() {
     return
   }
   const relabelOrders = [...new Set(assigned.value.filter((item) => item.sourceStage === 'RELABEL')
-    .map((item) => String(item.orderNo || '').trim()).filter(Boolean))]
+    .map((item) => String(item.orderRefs || '').trim()).filter(Boolean))]
+  if (assigned.value.some((item) => item.sourceStage === 'RELABEL' && !String(item.orderRefs || '').trim())) {
+    ElMessage.warning('换标来源单号缺失，请刷新后重新选择')
+    return
+  }
   if (relabelOrders.length && (relabelOrders.length !== 1 || assigned.value.some((item) => item.sourceStage !== 'RELABEL'))) {
     ElMessage.warning('一张换标单的托盘需要单独排车')
     return
@@ -363,13 +371,15 @@ watch([warehouseTab, () => query.orderType], () => {
   <OperationErrorToast :details="mutationError" />
   <AppDialog class="admin-density-dialog admin-density" :model-value="modelValue" title="智能排车" width="min(1800px, calc(100vw - 40px))" @update:model-value="close($event)">
     <section class="dispatch-query" aria-label="智能排车筛选">
-      <el-input v-model="query.orderNo" clearable placeholder="订单号" @keyup.enter="load" />
+      <el-input v-model="query.orderNo" clearable :placeholder="query.sourceStage === 'RELABEL' ? '换标单号 / 原入仓码' : '订单号 / 换标单号 / 原入仓码'" @keyup.enter="load" />
       <el-select v-model="query.orderType" clearable placeholder="全部订单类型"><el-option v-for="option in orderTypeOptions" :key="option.value" :label="option.label" :value="option.value" /></el-select>
-      <el-select v-model="query.sourceStage" clearable placeholder="全部状态"><el-option label="入库完成托盘" value="RECEIVED" /><el-option label="计划托盘" value="PLAN" /></el-select>
+      <el-select v-model="query.sourceStage" clearable placeholder="全部来源"><el-option label="已入库 / 待出库换标" value="RECEIVED" /><el-option label="待出库换标单" value="RELABEL" /><el-option label="计划托盘" value="PLAN" /></el-select>
       <el-input v-model="query.fbaWarehouseCode" clearable placeholder="FBA仓库" @keyup.enter="load" />
       <el-button type="primary" :loading="loading" @click="load">查询</el-button><el-button :disabled="loading" @click="reset">重置</el-button>
     </section>
 
+    <p v-if="query.sourceStage === 'RELABEL'" class="dispatch-source-hint">仅展示客户已确认、卡车派送且尚未排车的换标单。沿用原入库库存和托盘，按本次换标箱唛及新目的仓排车，无需重新生成入库单。</p>
+
     <nav class="warehouse-tabs density-tabs" aria-label="海外仓筛选">
       <button
  v-for="tab in [
@@ -425,6 +435,9 @@ watch([warehouseTab, () => query.orderType], () => {
             >
             <el-table-column label="目的地FBA" width="110"
  ><template #default="{ row }">{{ text(row.first.fbaWarehouseCode) }}</template></el-table-column
+            >
+            <el-table-column label="私人仓" min-width="220" show-overflow-tooltip
+ ><template #default="{ row }">{{ privateWarehouse(row.first) }}</template></el-table-column
             >
             <el-table-column label="体积(m³)" width="100" align="right"
  ><template #default="{ row }">{{

src/modules/overseas-warehouse/lastMilePresentation.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { formatOverseasDateTime, inventoryBusinessTypeLabel, lastMileOrderReference, relabelBusinessStatusLabel, toLastMileOrderListItem } from './lastMilePresentation'
+import { formatOverseasDateTime, inventoryBusinessTypeLabel, lastMileOrderReference, lastMileStatusLabel, packageDifferenceText, relabelBusinessStatusLabel, toLastMileOrderListItem } from './lastMilePresentation'
 
 describe('last-mile order presentation adapter', () => {
   it('formats overseas timestamps with zero-padded seconds', () => {
@@ -85,6 +85,30 @@ describe('last-mile order presentation adapter', () => {
     })
   })
 
+  it('maps warehouse transfer receiving quantities and formats differences', () => {
+    const transfer = toLastMileOrderListItem({
+      id: '4', customerId: '100', orderNo: 'WT-1', orderType: 'WAREHOUSE_TRANSFER',
+      packageCount: 10, receivedPackageCount: 12, packageDifference: 2,
+    })
+    expect(transfer).toMatchObject({ cartons: 10, cartonDifference: 2 })
+    expect(packageDifferenceText(2)).toBe('+2')
+    expect(packageDifferenceText(-2)).toBe('-2')
+    expect(packageDifferenceText(0)).toBe('0')
+    expect(packageDifferenceText('—')).toBe('—')
+
+    const ordinary = toLastMileOrderListItem({ id: '5', customerId: '100', orderNo: 'LM-1', orderType: 'FIRST_LEG', packageCount: 10 })
+    expect(ordinary).toMatchObject({ cartons: 10, cartonDifference: '—' })
+  })
+
+  it.each([
+    ['PENDING_REVIEW', '待审核'],
+    ['WAIT_PDA_RECEIVING', '入库测量中'],
+    ['WAIT_CUSTOMER_CONFIRMATION', '待客户确认实测'],
+    ['INBOUND_COMPLETED', '入库完成'],
+  ])('maps warehouse transfer status %s to %s', (status, expected) => {
+    expect(lastMileStatusLabel(status)).toBe(expected)
+  })
+
   it.each([
     ['RELABEL_APPLICATION', '换标下单'],
     ['WAREHOUSE_TRANSFER', '仓储转运'],
@@ -108,7 +132,7 @@ describe('last-mile order presentation adapter', () => {
   it.each([
     ['PENDING_PROCESSING', '待处理'],
     ['PROCESSING', '处理中'],
-    ['CUSTOMER_CONFIRM_PENDING', '待处理'],
+    ['CUSTOMER_CONFIRM_PENDING', '换标完成'],
     ['READY_FOR_OUTBOUND', '换标完成'],
     ['COMPLETED', '换标完成'],
   ])('collapses internal relabel node %s into business status %s', (status, expected) => {

src/modules/overseas-warehouse/lastMilePresentation.ts

@@ -15,8 +15,21 @@ const orderTypeLabels: Record<string, string> = {
 
 const statusLabels: Record<string, string> = {
   PENDING_REVIEW: '待审核',
+  WAIT_PDA_RECEIVING: '入库测量中',
+  INBOUND_MEASURING: '入库测量中',
+  WAIT_CUSTOMER_CONFIRMATION: '待客户确认实测',
+  INBOUND_COMPLETED: '入库完成',
   APPROVED: '审核通过',
   PENDING_ASSIGNMENT: '待分配',
+  WAIT_RELABEL: '待换标',
+  WAIT_FBA_DESTINATION: '待确认目的仓',
+  READY_FOR_DISPATCH: '待创建出库单',
+  WAIT_OUTBOUND: '待出库',
+  ALLOCATED: '已分配库存',
+  OUTBOUNDED: '已出库',
+  PARTIALLY_RECEIVED: '部分收货',
+  RECEIVED: '已收货',
+  IN_TRANSIT: '运输中',
   DESTINATION_ASSIGNED: '已分配目的仓',
   INBOUND_PLANNED: '已生成入库计划',
   PENDING_PROCESSING: '待处理',
@@ -61,12 +74,17 @@ export function lastMileStatusLabel(value: unknown) {
   return statusLabels[code] || text(code)
 }
 
+export function packageDifferenceText(value: number | '—' | null | undefined) {
+  if (value == null || value === '—' || !Number.isFinite(value)) return '—'
+  return value > 0 ? `+${value}` : String(value)
+}
+
 // 认领后显示处理中，可出库节点统一显示换标完成。
 export function relabelBusinessStatusLabel(value: unknown) {
   const code = String(value ?? '').trim()
   if (code === 'PROCESSING') return '处理中'
   if (!code || code === 'NOT_REQUIRED') return '—'
-  return ['READY_FOR_OUTBOUND', 'COMPLETED'].includes(code) ? '换标完成' : '待处理'
+  return ['CUSTOMER_CONFIRM_PENDING', 'READY_FOR_OUTBOUND', 'COMPLETED'].includes(code) ? '换标完成' : '待处理'
 }
 
 export function lastMileOrderTypeLabel(value: unknown) {
@@ -106,6 +124,7 @@ export function palletMergeLabel(value: unknown) {
 }
 
 export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileOrderListItem {
+  const warehouseTransfer = dto.orderType === 'WAREHOUSE_TRANSFER'
   return {
     id: String(dto.id),
     customerId: String(dto.customerId),
@@ -135,6 +154,7 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
     version: Number(dto.version ?? 0),
     pallets: metric(dto.palletCount),
     cartons: metric(dto.packageCount),
+    cartonDifference: warehouseTransfer ? metric(dto.packageDifference) : '—',
     volume: metric(dto.volumeCbm),
     quantity: metric(dto.productQuantity),
     volumeWeight: metric(dto.volumeWeightKg),
@@ -147,6 +167,7 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
     outboundOrderNo: text(dto.outboundOrderNo),
     dispatchOrderNo: text(dto.deliveryOrderNo),
     relabelOrderNo: text(dto.relabelOrderNo),
+    relabelStatusCode: String(dto.relabelStatus ?? '').trim(),
     relabelStatus: relabelBusinessStatusLabel(dto.relabelStatus),
     consolidated: palletMergeLabel(dto.palletMergeFlag),
     palletMergeFlag: String(dto.palletMergeFlag ?? '').trim(),

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

@@ -55,4 +55,34 @@ describe('LastMileOrderDetailView domestic detail alignment', () => {
       if (index === 1) expect(panel.text()).toContain('SKU-001')
     }
   })
+
+  it('shows declared, received and highlighted signed difference only for warehouse transfers', async () => {
+    vi.mocked(getLastMileOrder).mockResolvedValue({
+      order: { id: 'transfer-id', customerId: 'customer-1', orderNo: 'WT-001', orderType: 'WAREHOUSE_TRANSFER', currentStatus: 'WAIT_CUSTOMER_CONFIRMATION', packageCount: 10, receivedPackageCount: 12, packageDifference: 2 },
+      cargo: [], fees: [], statusHistory: [], operationHistory: [],
+    })
+    const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    const fields = wrapper.get('dl[aria-label="基本信息"]')
+    expect(fields.text()).toContain('客户预报箱数10')
+    expect(fields.text()).toContain('实收箱数12')
+    expect(fields.text()).toContain('箱数差异+2')
+    expect(fields.get('.package-difference--nonzero').text()).toBe('+2')
+    expect(wrapper.get('.status-badge').text()).toBe('入库测量中')
+    const overview = wrapper.get('[aria-label="尾程订单概览"]')
+    expect(overview.text()).toContain('实收总箱数12 箱')
+    expect(overview.text()).not.toContain('客户预报总箱数')
+  })
+
+  it('shows the declared total before a warehouse transfer has a received count', async () => {
+    vi.mocked(getLastMileOrder).mockResolvedValue({
+      order: { id: 'transfer-id', customerId: 'customer-1', orderNo: 'WT-002', orderType: 'WAREHOUSE_TRANSFER', currentStatus: 'WAIT_PDA_RECEIVING', packageCount: 10, receivedPackageCount: null, packageDifference: null },
+      cargo: [], fees: [], statusHistory: [], operationHistory: [],
+    })
+    const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    const overview = wrapper.get('[aria-label="尾程订单概览"]')
+    expect(overview.text()).toContain('客户预报总箱数10 箱')
+    expect(overview.text()).not.toContain('实收总箱数')
+  })
 })

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

@@ -13,7 +13,7 @@ import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.v
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import { createLastMileOrderFee, getLastMileOrder, type LastMileOrderDetailDto } from '../api/lastMileOrders'
-import { formatOverseasDateTime, lastMileOrderReference, lastMileOrderTypeLabel, lastMileStatusLabel } from '../lastMilePresentation'
+import { formatOverseasDateTime, lastMileOrderReference, lastMileOrderTypeLabel, lastMileStatusLabel, packageDifferenceText } from '../lastMilePresentation'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import OverseasDetailShell from '../components/OverseasDetailShell.vue'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
@@ -56,7 +56,7 @@ function isSingleLineBusinessField(field: DetailField) { return field.label ===
 const referenceValue = computed(() => lastMileOrderReference(detail.value?.order.orderNo, '订单编码待补充'))
 const orderFields = computed<DetailField[]>(() => {
   const order = detail.value?.order
-  return [
+  const fields: DetailField[] = [
     { label: '订单类型', value: text(order?.orderTypeName || lastMileOrderTypeLabel(order?.orderType)) },
     { label: '入仓码', value: text(order?.inboundCode) },
     { label: '货主', value: text(order?.customerName) },
@@ -69,7 +69,14 @@ const orderFields = computed<DetailField[]>(() => {
     { label: '仓库异常作业备注', wide: true, value: text(order?.warehouseRemark) },
     { label: '备注（客户）', wide: true, value: text(order?.customerRemark) },
   ]
+  if (order?.orderType === 'WAREHOUSE_TRANSFER') fields.splice(6, 0,
+    { label: '客户预报箱数', value: order.packageCount == null ? '—' : order.packageCount },
+    { label: '实收箱数', value: order.receivedPackageCount == null ? '—' : order.receivedPackageCount },
+    { label: '箱数差异', value: packageDifferenceText(order.packageDifference) },
+  )
+  return fields
 })
+function isNonzeroDifference(field: DetailField) { return field.label === '箱数差异' && field.value !== '—' && field.value !== '0' }
 const containerFields = computed<DetailField[]>(() => {
   const order = detail.value?.order
   return [
@@ -87,10 +94,12 @@ const containerFields = computed<DetailField[]>(() => {
 const basicFields = computed(() => [...orderFields.value, ...containerFields.value])
 const overviewFields = computed(() => {
   const order = detail.value?.order
+  const warehouseTransfer = order?.orderType === 'WAREHOUSE_TRANSFER'
+  const hasReceivedPackages = warehouseTransfer && order?.receivedPackageCount != null
   return [
     { label: '客户', value: text(order?.customerName) },
     { label: '海外仓', value: text(order?.overseasWarehouseName) },
-    { label: '总箱数', value: order?.packageCount == null ? '—' : order.packageCount + ' 箱' },
+    { label: warehouseTransfer ? (hasReceivedPackages ? '实收总箱数' : '客户预报总箱数') : '总箱数', value: (hasReceivedPackages ? order?.receivedPackageCount : order?.packageCount) == null ? '—' : `${hasReceivedPackages ? order?.receivedPackageCount : order?.packageCount} 箱` },
     { label: '总托数', value: order?.palletCount == null ? '—' : order.palletCount + ' 托' },
     { label: '体积', value: order?.volumeCbm == null ? '—' : order.volumeCbm + ' m³' },
     { label: '最近更新', value: formatOverseasDateTime(order?.updatedAt) },
@@ -196,7 +205,7 @@ onMounted(load)
       <el-tabs v-model="activeTab" class="detail-tabs density-element-tabs density-contained-tabs">
         <el-tab-pane name="basic"><template #label><span class="density-tab-icon" aria-hidden="true">📋</span><span>基本信息</span></template>
           <dl class="detail-fields density-fields" aria-label="基本信息">
-            <div v-for="field in basicFields" :key="field.label" :class="{ wide: field.wide }"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div>
+            <div v-for="field in basicFields" :key="field.label" :class="{ wide: field.wide }"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field), 'package-difference--nonzero': isNonzeroDifference(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div>
           </dl>
         </el-tab-pane>
         <el-tab-pane name="cargo"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>货物信息</span></template><section class="table-panel"><DataTable :data="cargo" :columns="cargoColumns" column-settings-mode="hide" row-key="id" empty-text="暂无货物明细"></DataTable></section></el-tab-pane>
@@ -226,6 +235,7 @@ onMounted(load)
 <style scoped>
 .detail-fields > div.wide { grid-column: span 2; }
 .detail-field-value--business { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.package-difference--nonzero { color: var(--el-color-danger); font-weight: 600; }
 .plan-panel { margin-bottom: var(--admin-space-5); }
 .related-panel { margin-top: var(--admin-space-5); }
 .fee-form { min-width: 0; overflow-x: hidden; }

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

@@ -159,6 +159,21 @@ async function chooseContainer(wrapper: Awaited<ReturnType<typeof mountView>>) {
 }
 
 describe('LastMileOrdersView pending order and container conversion', () => {
+  it('keeps the original carton count and adds only the signed difference in the list', async () => {
+    canAccess.mockReturnValue(false)
+    vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{
+      id: 'transfer-1', customerId, orderNo: 'WT-1', orderType: 'WAREHOUSE_TRANSFER', currentStatus: 'WAIT_CUSTOMER_CONFIRMATION',
+      packageCount: 10, receivedPackageCount: 8, packageDifference: -2,
+    }], page: 1, size: 10, total: 1, pages: 1 })
+    const wrapper = await mountView()
+    const table = wrapper.findComponent(DataTable)
+    const columns = table.props('columns') as Array<{ key: string; label: string }>
+    expect(columns).toEqual(expect.arrayContaining([expect.objectContaining({ key: 'cartonDifference', label: '差异(箱)' })]))
+    expect(columns.some((column) => ['declaredCartons', 'receivedCartons'].includes(column.key))).toBe(false)
+    expect((table.props('data') as Array<{ cartons: unknown }>)[0]?.cartons).toBe(10)
+    expect(wrapper.get('.package-difference--nonzero').text()).toBe('-2')
+  })
+
   it.each([
     [[], ['查看'], false],
     [['inbound-order:create'], ['查看', '入库计划'], false],

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

@@ -2,7 +2,7 @@
 import '@/styles/adminDensity.css'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { Download, Pencil, MoreHorizontal } from '@lucide/vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import { listAllPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
@@ -17,9 +17,10 @@ import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/compone
 import { changeContainerReceivingWarehouse, convertLastMileContainerToInboundPlans, createManualInboundPlan, downloadLastMileOrders, getContainerInboundPlanPreview, getContainerPlanProgress, getLastMileOrderManualNodes, listContainerPlanProgress, listLastMileOrders, transferLastMileOrders, updateLastMileOrderHold, updateLastMileOrderManualNodes, type ContainerInboundPlanPreviewDto, type ContainerInboundPlanPreviewGroupDto, type ContainerInboundPlanPreviewOrderDto, type ContainerPlanProgressDetailDto, type ContainerPlanProgressSummaryDto, type ManualNodeCode } from '../api/lastMileOrders'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import WarehouseTransferReviewDialog from '../components/WarehouseTransferReviewDialog.vue'
+import { confirmRelabelCompletion, getRelabelReviewTask, returnRelabelForRework } from '../api/relabelOrders'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { overseasWarehousePermissions as permission } from '../permissions'
-import { lastMileStatusLabel, toLastMileOrderListItem } from '../lastMilePresentation'
+import { lastMileStatusLabel, packageDifferenceText, toLastMileOrderListItem } from '../lastMilePresentation'
 import type { LastMileOrderListItem } from '../types'
 import { saveCsv } from '@/shared/downloadCsv'
 
@@ -133,6 +134,9 @@ const allFields: QueryField[] = [
   { key: 'transferWarehouseCode', type: 'input', label: '转仓代码', width: 170, placeholder: '请输入转仓代码' },
   { key: 'status', type: 'select', label: '当前状态', width: 160, placeholder: '全部状态', options: [
     { label: '待分配', value: 'PENDING_ASSIGNMENT' },
+    { label: '待换标', value: 'WAIT_RELABEL' },
+    { label: '待排车', value: 'READY_FOR_DISPATCH' },
+    { label: '待出库', value: 'WAIT_OUTBOUND' },
     { label: '待入库', value: 'PENDING_INBOUND' },
     { label: '入库完成', value: 'INBOUND_COMPLETED' },
     { label: '待派送', value: 'PENDING_DELIVERY' },
@@ -218,6 +222,7 @@ const columns: DataTableColumn[] = [
   { key: 'held', prop: 'held', label: '是否暂扣', width: 100 },
   { key: 'pallets', prop: 'pallets', label: '托数', width: 80, align: 'right' },
   { key: 'cartons', prop: 'cartons', label: '箱数', width: 80, align: 'right' },
+  { key: 'cartonDifference', prop: 'cartonDifference', label: '差异(箱)', width: 100, align: 'right', slotName: 'cartonDifference' },
   { key: 'volume', prop: 'volume', label: '体积(m³)', width: 100, align: 'right' },
   { key: 'quantity', prop: 'quantity', label: '数量', width: 80, align: 'right' },
   { key: 'volumeWeight', prop: 'volumeWeight', label: '体积重量', width: 100, align: 'right' },
@@ -770,10 +775,40 @@ watch(containerConvertOpen, (open) => {
 
 function rowActionCount(source: object) {
   const row = source as LastMileOrderListItem
-  return 1
+  const count = 1
     + Number(access.can(permission.warehouseTransferApprove) && row.orderTypeCode === 'WAREHOUSE_TRANSFER' && row.currentStatusCode === 'PENDING_REVIEW')
     + Number(access.can(permission.inboundOrderCreate))
     + (access.can(permission.lastMileOrderTransfer) ? 2 : 0)
+    + Number(access.can(permission.relabelOrderStatus) && Boolean(row.relabelOrderNo) && canConfirmRelabel(row))
+    + Number(access.can(permission.relabelOrderStatus) && Boolean(row.relabelOrderNo) && canReworkRelabel(row))
+  return hasRelabelActions(row) ? Math.max(4, count) : count
+}
+function canConfirmRelabel(row: { relabelStatusCode?: string }) { return row.relabelStatusCode === 'CUSTOMER_CONFIRM_PENDING' }
+function canReworkRelabel(row: { relabelStatusCode?: string }) { return ['CUSTOMER_CONFIRM_PENDING', 'PROCESSING'].includes(row.relabelStatusCode ?? '') }
+function hasRelabelActions(source: object) {
+  const row = source as LastMileOrderListItem
+  return access.can(permission.relabelOrderStatus) && Boolean(row.relabelOrderNo) && (canConfirmRelabel(row) || canReworkRelabel(row))
+}
+async function confirmRelabel(row: { relabelOrderNo?: string }) {
+  const relabelNo = row.relabelOrderNo
+  if (!relabelNo) return
+  try {
+    await ElMessageBox.confirm('确认仓库上传的换标结果无误并继续后续流程吗？', '换标完成确认', { confirmButtonText: '确认并继续', cancelButtonText: '取消' })
+    await confirmRelabelCompletion(relabelNo)
+    ElMessage.success('已确认换标完成')
+    await load()
+  } catch (error) { if (error !== 'cancel' && error !== 'close') ElMessage.error(getApiErrorDetails(error, '换标完成确认失败').message) }
+}
+async function reworkRelabel(row: { relabelOrderNo?: string }) {
+  const relabelNo = row.relabelOrderNo
+  if (!relabelNo) return
+  try {
+    const task = await getRelabelReviewTask(relabelNo)
+    const { value } = await ElMessageBox.prompt('填写退回原因，仓库将重新执行换标并上传照片。', '重新换标', { inputType: 'textarea', inputValidator: (value) => Boolean(value?.trim()) && value.trim().length <= 1000 || '请填写 1 至 1000 字原因', confirmButtonText: '确认重新换标', cancelButtonText: '取消' })
+    await returnRelabelForRework(relabelNo, task.version, value.trim(), crypto.randomUUID())
+    ElMessage.success('已退回重新换标')
+    await load()
+  } catch (error) { if (error !== 'cancel' && error !== 'close') ElMessage.error(getApiErrorDetails(error, '重新换标失败').message) }
 }
 function openDetail(source: object) {
   const row = source as LastMileOrderListItem
@@ -847,8 +882,9 @@ onMounted(() => { void load() })
     </section>
     <section v-else-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-last-mile-orders" row-key="id" empty-text="暂无尾程订单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
       <template #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderExport)" plain :loading="exportLoading" @click="exportOrders"><Download :size="16" />导出订单</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" plain :disabled="selectedRows.length !== 1 || actionLoading" @click="openInboundPlan()">生成入库计划</el-button><el-button v-if="statusTab === '待分配' && access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading" @click="openContainerConversion">按柜批量生成</el-button></template>
-      <template #actions="{ row }"><div class="row-actions density-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="warning" v-if="access.can(permission.warehouseTransferApprove) && row.orderTypeCode === 'WAREHOUSE_TRANSFER' && row.currentStatusCode === 'PENDING_REVIEW'" size="small" @click="openTransferReview(row)">审核</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.inboundOrderCreate)" :disabled="row.detained" size="small" @click="openInboundPlan(row)">入库计划</el-button><template v-if="rowActionCount(row) <= 3 && access.can(permission.lastMileOrderTransfer)"><el-button class="density-action" data-tone="warning" size="small" @click="openHold(row)">{{ row.detained ? '解除暂扣' : '暂扣订单' }}</el-button><el-button class="density-action" data-tone="neutral" size="small" @click="openManualNodes(row)">人工修改节点</el-button></template><el-dropdown v-if="rowActionCount(row) > 3" trigger="click"><el-button class="density-action" :aria-label="`更多操作 · ${row.orderNo || row.dispatchNo || '当前记录'}`" title="更多操作" data-tone="neutral" size="small" ><MoreHorizontal aria-hidden="true" :size="15" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item v-if="access.can(permission.lastMileOrderTransfer)" @click="openHold(row)">{{ row.detained ? '解除暂扣' : '暂扣订单' }}</el-dropdown-item><el-dropdown-item v-if="access.can(permission.lastMileOrderTransfer)" @click="openManualNodes(row)">人工修改节点</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
+      <template #actions="{ row }"><div class="row-actions density-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="warning" v-if="access.can(permission.warehouseTransferApprove) && row.orderTypeCode === 'WAREHOUSE_TRANSFER' && row.currentStatusCode === 'PENDING_REVIEW'" size="small" @click="openTransferReview(row)">审核</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.inboundOrderCreate)" :disabled="row.detained" size="small" @click="openInboundPlan(row)">入库计划</el-button><template v-if="rowActionCount(row) <= 3 && access.can(permission.lastMileOrderTransfer)"><el-button class="density-action" data-tone="warning" size="small" @click="openHold(row)">{{ row.detained ? '解除暂扣' : '暂扣订单' }}</el-button><el-button class="density-action" data-tone="neutral" size="small" @click="openManualNodes(row)">人工修改节点</el-button></template><el-dropdown v-if="rowActionCount(row) > 3" trigger="click"><el-button class="density-action" :aria-label="`更多操作 · ${row.orderNo || row.dispatchNo || '当前记录'}`" title="更多操作" data-tone="neutral" size="small" ><MoreHorizontal aria-hidden="true" :size="15" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item v-if="access.can(permission.lastMileOrderTransfer)" @click="openHold(row)">{{ row.detained ? '解除暂扣' : '暂扣订单' }}</el-dropdown-item><el-dropdown-item v-if="access.can(permission.lastMileOrderTransfer)" @click="openManualNodes(row)">人工修改节点</el-dropdown-item><el-dropdown-item v-if="access.can(permission.relabelOrderStatus) && row.relabelOrderNo && canConfirmRelabel(row)" @click="confirmRelabel(row)">换标完成确认</el-dropdown-item><el-dropdown-item v-if="access.can(permission.relabelOrderStatus) && row.relabelOrderNo && canReworkRelabel(row)" @click="reworkRelabel(row)">重新换标</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
       <template #orderNo="{ row }"><OrderReferenceText :value="String(row.orderNo || '')" copyable /></template>
+      <template #cartonDifference="{ row }"><span :class="{ 'package-difference--nonzero': typeof row.cartonDifference === 'number' && row.cartonDifference !== 0 }">{{ packageDifferenceText(row.cartonDifference) }}</span></template>
       <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable></section>
   </ListPageLayout></AdminPage>
@@ -1054,5 +1090,6 @@ onMounted(() => { void load() })
 .container-preview__metric { display: flex; min-height: var(--admin-row-height); padding: var(--admin-space-5) var(--admin-space-5); border: 0; border-radius: 0; background: var(--admin-surface); flex-direction: row; justify-content: flex-start; align-items: baseline; gap: var(--admin-space-3); border-right: 1px solid var(--cc-border); }
 .container-preview__metric:last-child { border-right: 0; }
 .container-preview__metric strong { margin-top: var(--admin-space-1); color: var(--cc-text); font-size: var(--admin-font-body); line-height: 20px; margin: 0; }
+.package-difference--nonzero { color: var(--el-color-danger); font-weight: 600; }
 
 </style>

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

@@ -41,7 +41,7 @@ const warehouseLabel = computed(() => {
   return outboundWarehouseId && delivery?.overseasWarehouseId === outboundWarehouseId ? show(delivery.overseasWarehouseName) : '—'
 })
 function statusLabel(value: unknown) { const code = String(value || ''); return statusLabels[code] || show(code) }
-function outboundTypeLabel(value?: string | null) { return value === 'ONE_CLICK_DROPSHIP' ? '一件代发出库' : value === 'RETURN_OUTBOUND' ? '退货出库' : value === 'DISPATCH_DELIVERY' ? '派送出库' : show(value) }
+function outboundTypeLabel(value?: string | null) { return value === 'WAREHOUSE_TRANSFER_OUTBOUND' ? '仓储转运出库' : value === 'ONE_CLICK_DROPSHIP' ? '一件代发出库' : value === 'RETURN_OUTBOUND' ? '退货出库' : value === 'DISPATCH_DELIVERY' ? '派送出库' : show(value) }
 const canCancel = computed(() => access.can(permission.outboundCancel) && ['WAIT_PICK', 'WAIT_OUTBOUND'].includes(String(detail.value?.outbound.status || '')))
 async function load() { if (!outboundNo.value) { loadError.value = { message: '详情缺少出库单号，请从出库单列表重新进入' }; return } loading.value = true; loadError.value = null; try { detail.value = await getOutbound(outboundNo.value) } catch (cause) { detail.value = null; loadError.value = getApiErrorDetails(cause, '出库单详情加载失败，请重试') } finally { loading.value = false } }
 async function cancel() { if (!canCancel.value || cancelling.value) return; let reason = ''; try { const result = await ElMessageBox.prompt(`确认取消出库单 ${outboundNo.value}？`, '取消出库单', { customClass: 'admin-density-confirm', inputType: 'textarea', inputPlaceholder: '请输入取消原因', inputPattern: /\S+/, inputErrorMessage: '请输入取消原因', confirmButtonText: '确认取消', cancelButtonText: '返回', type: 'warning' }); reason = result.value.trim() } catch { return } cancelling.value = true; mutationError.value = null; try { await cancelOutbound(outboundNo.value, reason); ElMessage.success('出库单已取消'); await load() } catch (cause) { mutationError.value = getApiErrorDetails(cause, '取消出库单失败，请重试') } finally { cancelling.value = false } }
@@ -54,7 +54,11 @@ watch(outboundNo, () => { void load() }, { immediate: true })
     <template #header><div class="detail-heading"><el-button class="density-back" link aria-label="返回出库单列表" @click="back"><ArrowLeft :size="16" />返回</el-button><div class="detail-title"><div><h1>出库单详情</h1><p>出库单号 {{ outboundNo }}</p></div><StatusBadge v-if="detail" :status="statusLabel(detail.outbound.status)" /></div><el-button v-if="canCancel" type="danger" plain :loading="cancelling" @click="cancel"><XCircle :size="16" />取消出库单</el-button></div></template>
     <OperationErrorToast :details="mutationError" />
     <LoadErrorState v-if="loadError" title="出库单详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
-    <template v-else-if="detail"><section class="surface-panel detail-section"><h2>出库信息</h2><el-descriptions class="density-descriptions" :column="4" border><el-descriptions-item label="出库单号">{{ show(detail.outbound.outboundNo) }}</el-descriptions-item><el-descriptions-item label="出库类型">{{ outboundTypeLabel(detail.outbound.outboundType) }}</el-descriptions-item><el-descriptions-item label="关联排车单">{{ show(detail.outbound.dispatchNo) }}</el-descriptions-item><el-descriptions-item label="状态">{{ statusLabel(detail.outbound.status) }}</el-descriptions-item><el-descriptions-item label="海外仓">{{ warehouseLabel }}</el-descriptions-item><el-descriptions-item label="托盘数">{{ detail.outbound.palletCount ?? '—' }}</el-descriptions-item><el-descriptions-item label="箱数">{{ detail.outbound.packageCount ?? '—' }}</el-descriptions-item><el-descriptions-item label="创建时间">{{ formatOverseasDateTime(detail.outbound.createdAt) }}</el-descriptions-item></el-descriptions></section><section class="surface-panel detail-section"><h2>出库托盘</h2><DataTable class="outbound-pallet-table" aria-label="出库托盘" :data="detail.pallets || []" :columns="palletColumns" stripe column-settings-mode="hide" empty-text="暂无出库托盘" /></section><section class="surface-panel detail-section"><h2>关联派送</h2><el-empty v-if="!detail.deliveries?.length" description="暂无关联派送单" :image-size="56" /><div v-else class="delivery-list"><el-descriptions v-for="delivery in detail.deliveries" :key="delivery.deliveryNo" class="density-descriptions" :column="4" border><el-descriptions-item label="目的 FBA 仓">{{ show(delivery.destinationWarehouseCode || delivery.destinationWarehouseName) }}</el-descriptions-item><el-descriptions-item label="派送单号">{{ show(delivery.deliveryNo) }}</el-descriptions-item><el-descriptions-item label="派送状态">{{ statusLabel(delivery.status) }}</el-descriptions-item><el-descriptions-item label="运单号">{{ show(delivery.waybillNo) }}</el-descriptions-item><el-descriptions-item label="承运商">{{ show(delivery.carrierName) }}</el-descriptions-item><el-descriptions-item label="司机">{{ show(delivery.driverName) }}</el-descriptions-item><el-descriptions-item label="车牌">{{ show(delivery.vehiclePlate) }}</el-descriptions-item><el-descriptions-item label="计划派送">{{ formatOverseasDateTime(delivery.plannedDeliveryAt) }}</el-descriptions-item><el-descriptions-item label="托盘数">{{ delivery.palletCount }}</el-descriptions-item><el-descriptions-item label="箱数">{{ delivery.packageCount }}</el-descriptions-item><el-descriptions-item label="备注" :span="2">{{ show(delivery.remark) }}</el-descriptions-item></el-descriptions></div></section></template>
+    <template v-else-if="detail">
+      <section class="surface-panel detail-section"><h2>出库信息</h2><el-descriptions class="density-descriptions" :column="4" border><el-descriptions-item label="出库单号">{{ show(detail.outbound.outboundNo) }}</el-descriptions-item><el-descriptions-item label="出库类型">{{ outboundTypeLabel(detail.outbound.outboundType) }}</el-descriptions-item><el-descriptions-item label="关联排车单">{{ show(detail.outbound.dispatchNo) }}</el-descriptions-item><el-descriptions-item label="状态">{{ statusLabel(detail.outbound.status) }}</el-descriptions-item><el-descriptions-item label="海外仓">{{ warehouseLabel }}</el-descriptions-item><el-descriptions-item label="托盘数">{{ detail.outbound.palletCount ?? '—' }}</el-descriptions-item><el-descriptions-item label="箱数">{{ detail.outbound.packageCount ?? '—' }}</el-descriptions-item><el-descriptions-item label="创建时间">{{ formatOverseasDateTime(detail.outbound.createdAt) }}</el-descriptions-item></el-descriptions></section>
+      <section class="surface-panel detail-section"><h2>出库托盘</h2><DataTable class="outbound-pallet-table" aria-label="出库托盘" :data="detail.pallets || []" :columns="palletColumns" stripe column-settings-mode="hide" empty-text="暂无出库托盘" /></section>
+      <section class="surface-panel detail-section"><h2>关联派送</h2><el-empty v-if="!detail.deliveries?.length" description="暂无关联派送单" :image-size="56" /><div v-else class="delivery-list"><el-descriptions v-for="delivery in detail.deliveries" :key="delivery.deliveryNo" class="density-descriptions" :column="4" border><el-descriptions-item label="目的地">{{ delivery.destinationType === 'PRIVATE' ? show(delivery.deliveryAddress) : show(delivery.destinationWarehouseCode || delivery.destinationWarehouseName) }}</el-descriptions-item><el-descriptions-item label="联系人">{{ show(delivery.contactName) }}</el-descriptions-item><el-descriptions-item label="联系电话">{{ show(delivery.contactPhone) }}</el-descriptions-item><el-descriptions-item label="派送单号">{{ show(delivery.deliveryNo) }}</el-descriptions-item><el-descriptions-item label="派送状态">{{ statusLabel(delivery.status) }}</el-descriptions-item><el-descriptions-item label="运单号">{{ show(delivery.waybillNo) }}</el-descriptions-item><el-descriptions-item label="承运商">{{ show(delivery.carrierName) }}</el-descriptions-item><el-descriptions-item label="司机">{{ show(delivery.driverName) }}</el-descriptions-item><el-descriptions-item label="车牌">{{ show(delivery.vehiclePlate) }}</el-descriptions-item><el-descriptions-item label="计划派送">{{ formatOverseasDateTime(delivery.plannedDeliveryAt) }}</el-descriptions-item><el-descriptions-item label="托盘数">{{ delivery.palletCount }}</el-descriptions-item><el-descriptions-item label="箱数">{{ delivery.packageCount }}</el-descriptions-item><el-descriptions-item label="备注" :span="2">{{ show(delivery.remark) }}</el-descriptions-item></el-descriptions></div></section>
+    </template>
   </DetailPageLayout></AdminPage>
 </template>
 

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

@@ -81,4 +81,44 @@ describe('OutboundsView permissions and navigation', () => {
     expect(source).toContain(':page-sizes="[5, 10, 20, 50]"')
     expect(source).toContain('width="min(1320px, calc(100vw - 32px))"')
   })
+
+  it('resolves warehouse-transfer customer names from the platform customer list', () => {
+    const source = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/pages/OutboundsView.vue'), 'utf8')
+    expect(source).toContain('function transferCustomerName(row: WarehouseTransferOutboundCandidate)')
+    expect(source).toContain('String(item.id) === String(row.customerId)')
+    expect(source).toContain("customer?.legalName?.trim() || customer?.tenantName?.trim()")
+    expect(source).toContain('transferCustomerName(row as WarehouseTransferOutboundCandidate)')
+  })
+
+  it('keeps warehouse option requests within the platform page-size limit', () => {
+    const source = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/pages/OutboundsView.vue'), 'utf8')
+    expect(source).toContain("size: 200, warehouseType: 'FBA'")
+    expect(source).not.toContain('size: 500')
+  })
+
+  it('batch-binds destinationless transfers without creating an outbound order', () => {
+    const source = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/pages/OutboundsView.vue'), 'utf8')
+    const api = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/api/outbounds.ts'), 'utf8')
+    expect(source).toContain('无目的地转运单')
+    expect(source).toContain('绑定目的地并进入排车')
+    expect(source).toContain('privateDestinationPostalCode: postalCode.value.trim()')
+    expect(source).toContain('transfers: selected.map(item => ({ customerId: item.customerId, transferNo: item.transferNo }))')
+    expect(api).toContain('/platform/v1/last-leg/warehouse-transfers/bind-destination')
+    expect(source).not.toContain('await createWarehouseTransferOutbound')
+  })
+
+  it('auto-selects the sole warehouse-transfer candidate and shows destination state', () => {
+    const source = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/pages/OutboundsView.vue'), 'utf8')
+    const api = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/api/outbounds.ts'), 'utf8')
+    expect(source).toContain("if (transferCandidates.value.length === 1) selectedTransferPalletIds.value = [transferSelectionKey(transferCandidates.value[0])]")
+    expect(source).toContain("transferCandidates.value.length === 1 ? [transferCandidates.value[0]] : []")
+    expect(source).toContain('label="主单目的去向"')
+    expect(source).toContain("['私人仓', row.privateDestinationAddress?.trim(), row.privateDestinationPostalCode?.trim()]")
+    expect(source).toContain('`FBA · ${row.destinationWarehouseCode.trim()}`')
+    expect(source).toContain("return '未设置'")
+    expect(api).toContain('destinationWarehouseCode?: string | null')
+    expect(api).toContain("destinationType?: 'FBA' | 'PRIVATE' | null")
+    expect(api).toContain('privateDestinationAddress?: string | null')
+    expect(api).toContain('privateDestinationPostalCode?: string | null')
+  })
 })

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

@@ -15,7 +15,7 @@ import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import StatusBadge from '@/shared/components/StatusBadge.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
-import { cancelOutbound, createOneClickDropshipOutbound, createReturnOutbound, listOneClickOutboundCandidates, listReturnOutboundCandidates, listOutbounds, type OneClickOutboundCandidate, type OutboundRow, type ReturnOutboundCandidate } from '../api/outbounds'
+import { bindWarehouseTransferDestination, cancelOutbound, createOneClickDropshipOutbound, createReturnOutbound, listOneClickOutboundCandidates, listReturnOutboundCandidates, listWarehouseTransferOutboundCandidates, listOutbounds, type OneClickOutboundCandidate, type OutboundRow, type ReturnOutboundCandidate, type WarehouseTransferOutboundCandidate } from '../api/outbounds'
 import { type InventoryBalanceDto, type InventoryPositionDto } from '../api/inventory'
 import { formatOverseasDateTime } from '../lastMilePresentation'
 import { overseasWarehousePermissions as permission } from '../permissions'
@@ -25,9 +25,15 @@ import { getReturnCarton, listReturnCartons, listReturnStock, type ReturnCartonD
 
 const router = useRouter(); const access = useAccessPreviewStore()
 const rows = ref<OutboundRow[]>([]); const page = ref(1); const pageSize = ref(20); const total = ref(0); const loading = ref(false); const error = ref<ApiErrorDetails | null>(null); const mutationError = ref<ApiErrorDetails | null>(null)
-const filters = ref<QueryModel>({ documentNo: '', lxCode: '', warehouseId: '', status: '', outboundType: '' }); const createOpen = ref(false); const saving = ref(false); const recipient = ref(''); const remark = ref(''); const quantity = ref<number | undefined>(); const cartonMarks = ref(''); const selectedReturnMarks = ref<string[]>([]); const selectedCustomerId = ref(''); const selectedPositionId = ref(''); const positionOptions = ref<Array<{ balance: InventoryBalanceDto; position: InventoryPositionDto }>>([]); const dropshipCandidates = ref<OneClickOutboundCandidate[]>([]); const selectedDropshipIds = ref<string[]>([]); const returnCandidates = ref<ReturnOutboundCandidate[]>([]); const selectedWarehouseId = ref(''); const selectedReturnNo = ref(''); const outboundType = ref<'ONE_CLICK_DROPSHIP' | 'RETURN_OUTBOUND'>('ONE_CLICK_DROPSHIP'); const inventoryLoading = ref(false); const dropshipQueryInput = ref(''); const dropshipQuery = ref(''); const dropshipPage = ref(1); const dropshipPageSize = ref(5)
+const filters = ref<QueryModel>({ documentNo: '', lxCode: '', warehouseId: '', status: '', outboundType: '' }); const createOpen = ref(false); const saving = ref(false); const recipient = ref(''); const remark = ref(''); const quantity = ref<number | undefined>(); const cartonMarks = ref(''); const selectedReturnMarks = ref<string[]>([]); const selectedCustomerId = ref(''); const selectedPositionId = ref(''); const positionOptions = ref<Array<{ balance: InventoryBalanceDto; position: InventoryPositionDto }>>([]); const dropshipCandidates = ref<OneClickOutboundCandidate[]>([]); const selectedDropshipIds = ref<string[]>([]); const returnCandidates = ref<ReturnOutboundCandidate[]>([]); const selectedWarehouseId = ref(''); const selectedReturnNo = ref(''); const outboundType = ref<'ONE_CLICK_DROPSHIP' | 'RETURN_OUTBOUND' | 'WAREHOUSE_TRANSFER_OUTBOUND'>('ONE_CLICK_DROPSHIP'); const inventoryLoading = ref(false); const dropshipQueryInput = ref(''); const dropshipQuery = ref(''); const dropshipPage = ref(1); const dropshipPageSize = ref(5)
 const tenantOptions = ref<PlatformTenantResource[]>([])
 const warehouseOptionsSource = ref<PlatformWarehouseSummaryResource[]>([])
+const fbaWarehouseOptionsSource = ref<PlatformWarehouseSummaryResource[]>([])
+const transferCandidates = ref<WarehouseTransferOutboundCandidate[]>([])
+const selectedTransferPalletIds = ref<string[]>([])
+const destinationType = ref<'FBA' | 'PRIVATE'>('FBA')
+const selectedDestinationWarehouseId = ref('')
+const deliveryAddress = ref(''); const postalCode = ref(''); const contactName = ref(''); const contactPhone = ref('')
 const returnStockRows = ref<ReturnStockRow[]>([])
 const returnCartonRows = ref<ReturnCartonRow[]>([])
 const selectedReturnSkus = ref<string[]>([])
@@ -49,6 +55,14 @@ const customerOptions = computed(() => {
 })
 const availablePositionOptions = computed(() => positionOptions.value.filter(({ balance }) => balance.customerId === selectedCustomerId.value))
 const warehouseOptions = computed(() => warehouseOptionsSource.value.filter((item) => item.status === 'ACTIVE' && item.warehouseType === 'OVERSEAS').map((item) => ({ value: String(item.id), label: [item.warehouseName || '仓库名称待补充', item.warehouseCode].filter(Boolean).join(' · ') })))
+const fbaWarehouseOptions = computed(() => fbaWarehouseOptionsSource.value.filter(item => item.status === 'ACTIVE').map(item => ({ value: String(item.id), code: item.warehouseCode || '', name: item.warehouseName || '', label: [item.warehouseName || 'FBA仓名称待补充', item.warehouseCode].filter(Boolean).join(' · ') })))
+const selectedTransferRows = computed(() => transferCandidates.value.filter(item => selectedTransferPalletIds.value.includes(`${item.customerId}:${item.transferNo}`)))
+function transferCustomerName(row: WarehouseTransferOutboundCandidate) {
+  const snapshotName = row.customerName?.trim()
+  if (snapshotName) return snapshotName
+  const customer = tenantOptions.value.find(item => String(item.id) === String(row.customerId))
+  return customer?.legalName?.trim() || customer?.tenantName?.trim() || `客户 ${row.customerId}`
+}
 const selectedReturnStock = computed(() => returnStockRows.value.filter((item) => Number(item.availableQuantity || 0) > 0))
 const selectedReturnCartons = computed(() => returnCartonRows.value.filter((item) => item.status === 'AVAILABLE'))
 const queryTokens = (value: string) => value.split(/[,，\n]+/).map((item) => item.replace(/\s+/g, '').toLowerCase()).filter(Boolean)
@@ -71,16 +85,17 @@ const somePageSelected = computed(() => selectedPageCount.value > 0 && !allPageS
 const selectedDropshipCustomerCount = computed(() => new Set(dropshipCandidates.value.filter(item => selectedDropshipKeys.value.has(dropshipCandidateKey(item))).map(item => item.customerId).filter(Boolean)).size)
 const oneClickMarks = computed(() => typeof cartonMarks.value === 'string' ? cartonMarks.value.split(/[,\n，]+/).map(value => value.trim()).filter(Boolean) : [])
 const columns: DataTableColumn[] = [{ key: 'actions', label: '操作', width: 180, fixed: 'left', slotName: 'actions' }, { key: 'outboundNo', prop: 'outboundNo', label: '出库单号', minWidth: 180 }, { key: 'outboundType', prop: 'outboundType', label: '出库类型', width: 150, slotName: 'outboundType' }, { key: 'lxCodes', prop: 'lxCodes', label: 'LX代码', minWidth: 180 }, { key: 'dispatchNo', prop: 'dispatchNo', label: '关联排车单', minWidth: 160 }, { key: 'status', prop: 'status', label: '状态', width: 130, slotName: 'status' }, { key: 'palletCount', prop: 'palletCount', label: '托盘数', width: 100 }, { key: 'packageCount', prop: 'packageCount', label: '箱数', width: 100 }, { key: 'createdAt', prop: 'createdAt', label: '创建时间', minWidth: 180 }]
-const fields: QueryField[] = [{ key: 'documentNo', type: 'input', label: '出库单号', placeholder: '请输入出库单号', width: 220 }, { key: 'lxCode', type: 'input', label: 'LX代码', placeholder: '请输入领星入库单代码', width: 220 }, { key: 'warehouseId', type: 'input', label: '目的仓', placeholder: '请输入目的仓', width: 220 }, { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 160, options: [{ label: '全部', value: '' }, { label: '待拣货', value: 'WAIT_PICK' }, { label: '拣货中', value: 'PICKING' }, { label: '已拣货', value: 'PICKED' }, { label: '待出库', value: 'WAIT_OUTBOUND' }, { label: '已出库', value: 'OUTBOUNDED' }, { label: '已取消', value: 'CANCELLED' }] }, { key: 'outboundType', type: 'select', label: '出库类型', placeholder: '全部出库类型', width: 170, options: [{ label: '全部', value: '' }, { label: '一件代发出库', value: 'ONE_CLICK_DROPSHIP' }, { label: '退货出库', value: 'RETURN_OUTBOUND' }, { label: '派送出库', value: 'DISPATCH_DELIVERY' }] }]
+const fields: QueryField[] = [{ key: 'documentNo', type: 'input', label: '出库单号', placeholder: '请输入出库单号', width: 220 }, { key: 'lxCode', type: 'input', label: 'LX代码', placeholder: '请输入领星入库单代码', width: 220 }, { key: 'warehouseId', type: 'input', label: '目的仓', placeholder: '请输入目的仓', width: 220 }, { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 160, options: [{ label: '全部', value: '' }, { label: '待拣货', value: 'WAIT_PICK' }, { label: '拣货中', value: 'PICKING' }, { label: '已拣货', value: 'PICKED' }, { label: '待出库', value: 'WAIT_OUTBOUND' }, { label: '已出库', value: 'OUTBOUNDED' }, { label: '已取消', value: 'CANCELLED' }] }, { key: 'outboundType', type: 'select', label: '出库类型', placeholder: '全部出库类型', width: 170, options: [{ label: '全部', value: '' }, { label: '仓储转运出库', value: 'WAREHOUSE_TRANSFER_OUTBOUND' }, { label: '一件代发出库', value: 'ONE_CLICK_DROPSHIP' }, { label: '退货出库', value: 'RETURN_OUTBOUND' }, { label: '派送出库', value: 'DISPATCH_DELIVERY' }] }]
 
 async function load(model: QueryModel = filters.value) { Object.assign(filters.value, model); loading.value = true; error.value = null; try { const result = await listOutbounds({ page: page.value, size: pageSize.value, documentNo: String(filters.value.documentNo || '').trim() || undefined, lxCode: String(filters.value.lxCode || '').trim() || undefined, warehouseId: String(filters.value.warehouseId || '').trim() || undefined, status: String(filters.value.status || '').trim() || undefined, outboundType: String(filters.value.outboundType || '').trim() || undefined }); rows.value = result.records.map((row) => ({ ...row, createdAt: formatOverseasDateTime(row.createdAt) })); total.value = result.total } catch (cause) { error.value = getApiErrorDetails(cause, '出库单列表加载失败') } finally { loading.value = false } }
-function outboundTypeLabel(value?: string | null) { return value === 'ONE_CLICK_DROPSHIP' ? '一件代发出库' : value === 'RETURN_OUTBOUND' ? '退货出库' : value === 'DISPATCH_DELIVERY' ? '派送出库' : value || '—' }
+function outboundTypeLabel(value?: string | null) { return value === 'WAREHOUSE_TRANSFER_OUTBOUND' ? '仓储转运出库' : value === 'ONE_CLICK_DROPSHIP' ? '一件代发出库' : value === 'RETURN_OUTBOUND' ? '退货出库' : value === 'DISPATCH_DELIVERY' ? '派送出库' : value || '—' }
 async function loadInventoryOptions() {
   inventoryLoading.value = true
   try {
-    const [tenants, warehouses] = await Promise.allSettled([
+    const [tenants, warehouses, fbaWarehouses] = await Promise.allSettled([
       listPlatformTenants({ page: 1, size: 200, status: 'ACTIVE' }),
       listPlatformWarehouses({ page: 1, size: 200, warehouseType: 'OVERSEAS', status: 'ACTIVE' }),
+      listPlatformWarehouses({ page: 1, size: 200, warehouseType: 'FBA', status: 'ACTIVE' }),
     ])
     if (tenants.status === 'fulfilled') tenantOptions.value = tenants.value.records
     else ElMessage.error(getApiErrorDetails(tenants.reason, '客户列表加载失败').message)
@@ -91,13 +106,40 @@ async function loadInventoryOptions() {
         selectedWarehouseId.value = String(lax?.id || warehouses.value.records[0]?.id || '')
       }
     } else ElMessage.error(getApiErrorDetails(warehouses.reason, '海外仓列表加载失败').message)
+    if (fbaWarehouses.status === 'fulfilled') fbaWarehouseOptionsSource.value = fbaWarehouses.value.records
+    else ElMessage.error(getApiErrorDetails(fbaWarehouses.reason, 'FBA目的仓加载失败').message)
   } finally { inventoryLoading.value = false }
 }
-async function openCreate() { createOpen.value = true; outboundType.value = 'ONE_CLICK_DROPSHIP'; selectedCustomerId.value = ''; selectedWarehouseId.value = ''; selectedDropshipIds.value = []; dropshipCandidates.value = []; dropshipQueryInput.value = ''; dropshipQuery.value = ''; dropshipPage.value = 1; returnSkuQueryInput.value = ''; returnSkuQuery.value = ''; returnCartonQueryInput.value = ''; returnCartonQuery.value = ''; returnSkuPage.value = 1; returnCartonPage.value = 1; await loadInventoryOptions(); await loadDropshipCandidates() }
+async function openCreate() { createOpen.value = true; outboundType.value = 'ONE_CLICK_DROPSHIP'; selectedCustomerId.value = ''; selectedWarehouseId.value = ''; selectedDropshipIds.value = []; selectedTransferPalletIds.value = []; transferCandidates.value = []; destinationType.value = 'FBA'; selectedDestinationWarehouseId.value = ''; deliveryAddress.value = ''; postalCode.value = ''; contactName.value = ''; contactPhone.value = ''; dropshipCandidates.value = []; dropshipQueryInput.value = ''; dropshipQuery.value = ''; dropshipPage.value = 1; returnSkuQueryInput.value = ''; returnSkuQuery.value = ''; returnCartonQueryInput.value = ''; returnCartonQuery.value = ''; returnSkuPage.value = 1; returnCartonPage.value = 1; await loadInventoryOptions(); await loadDropshipCandidates() }
 async function loadDropshipCandidates() { if (!selectedWarehouseId.value) { dropshipCandidates.value = []; return }; dropshipPage.value = 1; inventoryLoading.value = true; try { dropshipCandidates.value = await listOneClickOutboundCandidates(selectedCustomerId.value || undefined, { warehouseId: selectedWarehouseId.value }) } catch (cause) { dropshipCandidates.value = []; ElMessage.error(getApiErrorDetails(cause, '一件代发订单加载失败').message) } finally { inventoryLoading.value = false } }
 async function changeDropshipWarehouse() { selectedDropshipIds.value = []; await loadDropshipCandidates() }
 async function selectCustomer() { selectedPositionId.value = ''; selectedDropshipIds.value = []; selectedReturnNo.value = ''; selectedReturnMarks.value = []; selectedReturnSkus.value = []; returnCandidates.value = []; returnStockRows.value = []; returnCartonRows.value = []; returnCartonDetails.value = {}; dropshipCandidates.value = []; dropshipPage.value = 1; if (outboundType.value === 'RETURN_OUTBOUND') { if (selectedCustomerId.value && selectedWarehouseId.value) await loadReturnCandidates(); return }; await loadDropshipCandidates() }
-async function changeOutboundType() { selectedReturnNo.value = ''; selectedReturnMarks.value = []; selectedReturnSkus.value = []; returnCandidates.value = []; returnStockRows.value = []; returnCartonRows.value = []; returnCartonDetails.value = {}; selectedDropshipIds.value = []; dropshipCandidates.value = []; if (outboundType.value === 'ONE_CLICK_DROPSHIP') await loadDropshipCandidates() }
+async function changeOutboundType() { selectedReturnNo.value = ''; selectedReturnMarks.value = []; selectedReturnSkus.value = []; returnCandidates.value = []; returnStockRows.value = []; returnCartonRows.value = []; returnCartonDetails.value = {}; selectedDropshipIds.value = []; selectedTransferPalletIds.value = []; dropshipCandidates.value = []; transferCandidates.value = []; if (outboundType.value === 'ONE_CLICK_DROPSHIP') await loadDropshipCandidates(); if (outboundType.value === 'WAREHOUSE_TRANSFER_OUTBOUND') await loadTransferCandidates() }
+async function loadTransferCandidates() {
+  inventoryLoading.value = true
+  try {
+    transferCandidates.value = await listWarehouseTransferOutboundCandidates({ customerId: selectedCustomerId.value || undefined, warehouseId: selectedWarehouseId.value || undefined })
+    const candidateKeys = new Set(transferCandidates.value.map(transferSelectionKey))
+    selectedTransferPalletIds.value = selectedTransferPalletIds.value.filter(key => candidateKeys.has(key))
+    if (transferCandidates.value.length === 1) selectedTransferPalletIds.value = [transferSelectionKey(transferCandidates.value[0])]
+  } catch (cause) {
+    transferCandidates.value = []
+    selectedTransferPalletIds.value = []
+    ElMessage.error(getApiErrorDetails(cause, '无目的地仓储转运单加载失败').message)
+  } finally { inventoryLoading.value = false }
+}
+function transferSelectionKey(row: WarehouseTransferOutboundCandidate) { return `${row.customerId}:${row.transferNo}` }
+function toggleTransferPallet(row: WarehouseTransferOutboundCandidate, checked: boolean | string | number) { const key = transferSelectionKey(row); selectedTransferPalletIds.value = checked ? [...new Set([...selectedTransferPalletIds.value, key])] : selectedTransferPalletIds.value.filter(id => id !== key) }
+function transferDestinationLabel(row: WarehouseTransferOutboundCandidate) {
+  if (row.destinationType === 'PRIVATE' || row.privateDestinationAddress?.trim()) {
+    return ['私人仓', row.privateDestinationAddress?.trim(), row.privateDestinationPostalCode?.trim()].filter(Boolean).join(' · ')
+  }
+  if (row.destinationWarehouseCode?.trim()) return `FBA · ${row.destinationWarehouseCode.trim()}`
+  return '未设置'
+}
+function transferHasDestination(row: WarehouseTransferOutboundCandidate) {
+  return Boolean(row.destinationWarehouseCode?.trim() || row.privateDestinationAddress?.trim())
+}
 async function loadReturnCandidates() { if (!selectedCustomerId.value || !selectedWarehouseId.value) return; inventoryLoading.value = true; try { const [candidates, stock, cartons] = await Promise.all([listReturnOutboundCandidates(selectedCustomerId.value, selectedWarehouseId.value), listReturnStock({ page: 1, size: 200, customerId: selectedCustomerId.value, overseasWarehouseId: selectedWarehouseId.value, status: 'AVAILABLE' }), listReturnCartons({ page: 1, size: 200, customerId: selectedCustomerId.value, overseasWarehouseId: selectedWarehouseId.value, status: 'AVAILABLE' })]); returnCandidates.value = candidates; returnStockRows.value = stock.records; returnCartonRows.value = cartons.records; const details = await Promise.all(cartons.records.map(async (row) => [row.cartonMark, await getReturnCarton(row.cartonMark)] as const)); returnCartonDetails.value = Object.fromEntries(details); selectedReturnSkus.value = []; selectedReturnMarks.value = [] } catch (cause) { ElMessage.error(getApiErrorDetails(cause, '客户库存加载失败').message) } finally { inventoryLoading.value = false } }
 function dropshipCandidateKey(item: OneClickOutboundCandidate) { return `${item.inventoryPositionId}:${item.skuCode || ''}` }
 function isDropshipSelected(item: OneClickOutboundCandidate) { return selectedDropshipIds.value.includes(dropshipCandidateKey(item)) }
@@ -115,7 +157,35 @@ function searchReturnSkus() { returnSkuQueryInput.value = normalizeBatchQuery(re
 function searchReturnCartons() { returnCartonQueryInput.value = normalizeBatchQuery(returnCartonQueryInput.value); returnCartonQuery.value = returnCartonQueryInput.value; returnCartonPage.value = 1 }
 function toggleReturnSku(sku: string, checked: boolean | string | number) { selectedReturnSkus.value = checked ? [...new Set([...selectedReturnSkus.value, sku])] : selectedReturnSkus.value.filter((value) => value !== sku) }
 function toggleReturnCarton(cartonMark: string, checked: boolean | string | number) { selectedReturnMarks.value = checked ? [...new Set([...selectedReturnMarks.value, cartonMark])] : selectedReturnMarks.value.filter((value) => value !== cartonMark) }
-async function submit() { const marks = String(cartonMarks.value).split(/[,\n，]+/).map(value => value.trim()).filter(Boolean); if (!selectedWarehouseId.value) { ElMessage.warning('请选择海外仓'); return }; if (outboundType.value === 'RETURN_OUTBOUND' && !selectedCustomerId.value) { ElMessage.warning('请选择客户'); return }; saving.value = true; try { if (outboundType.value === 'RETURN_OUTBOUND') { if (!recipient.value.trim() || !selectedReturnNo.value || !selectedReturnMarks.value.length) { ElMessage.warning('请填写收件信息并选择退货单和箱唛'); return }; await createReturnOutbound(selectedCustomerId.value, { recipient: recipient.value.trim(), overseasWarehouseId: selectedWarehouseId.value, returnNo: selectedReturnNo.value, cartonMarks: selectedReturnMarks.value, remark: remark.value.trim() || undefined, idempotencyKey: `web-return-${Date.now()}` }); ElMessage.success('退货出库单已创建并推送PDA箱唛拣货任务') } else { const selected = dropshipCandidates.value.filter(item => selectedDropshipIds.value.includes(dropshipCandidateKey(item))); if (!selected.length) { ElMessage.warning('请至少选择一个已完成入库的一件代发订单'); return }; const customerIds = new Set(selected.map(item => item.customerId).filter(Boolean)); if (customerIds.size !== 1) { ElMessage.warning('一张出库单只能选择同一个客户的订单'); return }; const warehouses = new Set(selected.map(item => item.overseasWarehouseId).filter(Boolean)); if (warehouses.size > 1 || (warehouses.size === 1 && !warehouses.has(selectedWarehouseId.value))) { ElMessage.warning('所选订单必须属于当前海外仓'); return }; const items = selected.map(item => ({ inventoryPositionId: item.inventoryPositionId, packages: item.availablePackages, sku: item.skuCode || '', cartonMarks: [] as string[] })); await createOneClickDropshipOutbound([...customerIds][0] || '', { recipient: '一件代发订单直出', items, remark: remark.value.trim() || undefined, idempotencyKey: `web-dropship-${Date.now()}` }); ElMessage.success(`已按订单生成 ${selected.length} 个托盘出库明细并推送PDA拣货任务`) } createOpen.value = false; await load() } catch (cause) { ElMessage.error(getApiErrorDetails(cause, '出库单创建失败').message) } finally { saving.value = false } }
+async function submit() {
+  if (outboundType.value !== 'WAREHOUSE_TRANSFER_OUTBOUND' && !selectedWarehouseId.value) { ElMessage.warning('请选择海外仓'); return }
+  if (outboundType.value === 'RETURN_OUTBOUND' && !selectedCustomerId.value) { ElMessage.warning('请选择客户'); return }
+  saving.value = true
+  try {
+    if (outboundType.value === 'WAREHOUSE_TRANSFER_OUTBOUND') {
+      const selected = selectedTransferRows.value.length ? selectedTransferRows.value : transferCandidates.value.length === 1 ? [transferCandidates.value[0]] : []
+      if (!selected.length) { ElMessage.warning('请至少选择一个无目的地的仓储转运单'); return }
+      const destination = fbaWarehouseOptions.value.find(item => item.value === selectedDestinationWarehouseId.value)
+      if (destinationType.value === 'FBA' && !destination) { ElMessage.warning('请选择FBA目的仓'); return }
+      if (destinationType.value === 'PRIVATE' && (!deliveryAddress.value.trim() || !postalCode.value.trim() || !contactName.value.trim() || !contactPhone.value.trim())) { ElMessage.warning('请完整填写私人仓地址、邮编、联系人和电话'); return }
+      await bindWarehouseTransferDestination({ transfers: selected.map(item => ({ customerId: item.customerId, transferNo: item.transferNo })), destinationType: destinationType.value, destinationWarehouseId: destination?.value, destinationWarehouseCode: destination?.code, destinationWarehouseName: destination?.name, privateDestinationAddress: deliveryAddress.value.trim() || undefined, privateDestinationPostalCode: postalCode.value.trim() || undefined, privateDestinationContactName: contactName.value.trim() || undefined, privateDestinationContactPhone: contactPhone.value.trim() || undefined, idempotencyKey: `web-transfer-destination-${Date.now()}` })
+      ElMessage.success(`已为 ${selected.length} 个转运单绑定目的地，可进入智能排车`)
+    } else if (outboundType.value === 'RETURN_OUTBOUND') {
+      if (!recipient.value.trim() || !selectedReturnNo.value || !selectedReturnMarks.value.length) { ElMessage.warning('请填写收件信息并选择退货单和箱唛'); return }
+      await createReturnOutbound(selectedCustomerId.value, { recipient: recipient.value.trim(), overseasWarehouseId: selectedWarehouseId.value, returnNo: selectedReturnNo.value, cartonMarks: selectedReturnMarks.value, remark: remark.value.trim() || undefined, idempotencyKey: `web-return-${Date.now()}` })
+      ElMessage.success('退货出库单已创建并推送PDA箱唛拣货任务')
+    } else {
+      const selected = dropshipCandidates.value.filter(item => selectedDropshipIds.value.includes(dropshipCandidateKey(item)))
+      if (!selected.length) { ElMessage.warning('请至少选择一个已完成入库的一件代发订单'); return }
+      const customerIds = new Set(selected.map(item => item.customerId).filter(Boolean)); if (customerIds.size !== 1) { ElMessage.warning('一张出库单只能选择同一个客户的订单'); return }
+      const warehouses = new Set(selected.map(item => item.overseasWarehouseId).filter(Boolean)); if (warehouses.size > 1 || (warehouses.size === 1 && !warehouses.has(selectedWarehouseId.value))) { ElMessage.warning('所选订单必须属于当前海外仓'); return }
+      const items = selected.map(item => ({ inventoryPositionId: item.inventoryPositionId, packages: item.availablePackages, sku: item.skuCode || '', cartonMarks: [] as string[] }))
+      await createOneClickDropshipOutbound([...customerIds][0] || '', { recipient: '一件代发订单直出', items, remark: remark.value.trim() || undefined, idempotencyKey: `web-dropship-${Date.now()}` })
+      ElMessage.success(`已按订单生成 ${selected.length} 个托盘出库明细并推送PDA拣货任务`)
+    }
+    createOpen.value = false; await load()
+  } catch (cause) { ElMessage.error(getApiErrorDetails(cause, '出库单创建失败').message) } finally { saving.value = false }
+}
 function openDetail(row: OutboundRow) { void router.push({ name: 'overseas-outbound-detail', params: { outboundNo: row.outboundNo } }) }
 function canCancel(row: OutboundRow) { return access.can(permission.outboundCancel) && ['WAIT_PICK', 'WAIT_OUTBOUND'].includes(String(row.status || '')) }
 async function cancel(row: OutboundRow) { if (!canCancel(row)) return; let reason = ''; try { const result = await ElMessageBox.prompt(`出库单 ${row.outboundNo} · 出库数量 ${row.packageCount ?? 0}`, '取消出库单', { customClass: 'admin-density-confirm', inputType: 'textarea', inputPlaceholder: '请输入取消原因', inputPattern: /\S+/, inputErrorMessage: '请输入取消原因', confirmButtonText: '确认取消', cancelButtonText: '返回', type: 'warning' }); reason = result.value.trim() } catch { return }; mutationError.value = null; try { await cancelOutbound(row.outboundNo, reason); ElMessage.success('出库单已取消，库存及关联单据已回滚'); await load() } catch (cause) { mutationError.value = getApiErrorDetails(cause, '取消出库单失败') } }
@@ -135,12 +205,13 @@ onMounted(load)
       <template #status="{ row }"><StatusBadge :status="row.status === 'CANCELLED' ? '已取消' : row.status === 'OUTBOUNDED' ? '已出库' : row.status === 'PICKED' ? '已拣货' : row.status === 'WAIT_OUTBOUND' ? '待出库' : row.status === 'PICKING' ? '拣货中' : row.status === 'WAIT_PICK' ? '待拣货' : '未知状态'" /></template>
     </DataTable></section>
   </ListPageLayout></AdminPage>
-  <AppDialog class="admin-density-dialog" v-model="createOpen" title="新建出库单" width="min(1320px, calc(100vw - 32px))" confirm-text="生成出库单并推送PDA" :confirm-loading="saving" @confirm="submit">
+  <AppDialog class="admin-density-dialog" v-model="createOpen" title="新建出库单" width="min(1320px, calc(100vw - 32px))" :confirm-text="outboundType === 'WAREHOUSE_TRANSFER_OUTBOUND' ? '绑定目的地并进入排车' : '生成出库单并推送PDA'" :confirm-loading="saving" @confirm="submit">
     <el-form class="create-outbound-form density-form" label-position="top">
       <el-form-item label="出库类型" required>
         <el-radio-group v-model="outboundType" @change="changeOutboundType">
           <el-radio-button label="ONE_CLICK_DROPSHIP">一件代发出库</el-radio-button>
           <el-radio-button label="RETURN_OUTBOUND">退货出库</el-radio-button>
+          <el-radio-button label="WAREHOUSE_TRANSFER_OUTBOUND">仓储转运出库</el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="outboundType === 'RETURN_OUTBOUND'" label="客户" required>
@@ -148,7 +219,7 @@ onMounted(load)
           <el-option v-for="item in customerOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
-      <template v-if="outboundType !== 'RETURN_OUTBOUND'">
+      <template v-if="outboundType === 'ONE_CLICK_DROPSHIP'">
         <div class="dropship-search-row">
         <el-form-item label="海外仓" required>
           <el-select v-model="selectedWarehouseId" filterable clearable default-first-option aria-label="搜索海外仓" placeholder="输入仓库名称或编码搜索" @change="changeDropshipWarehouse">
@@ -186,6 +257,29 @@ onMounted(load)
           <p v-else class="candidate-hint">按托盘与 SKU 选择，默认出库全部可用箱数；仅限同一客户、同一海外仓，翻页保留选择。</p>
         </section>
       </template>
+      <template v-else-if="outboundType === 'WAREHOUSE_TRANSFER_OUTBOUND'">
+        <el-alert title="仅展示已完成入库、换标已完成或无需换标，并且尚未设置目的地的仓储转运单。绑定后将从此列表移除并进入智能排车候选。" type="info" :closable="false" />
+        <el-form-item label="无目的地转运单" required>
+          <el-table v-loading="inventoryLoading" :data="transferCandidates" border stripe class="dropship-candidate-table" max-height="380">
+            <el-table-column label="选择" width="68" align="center"><template #default="{ row }"><el-checkbox :model-value="selectedTransferPalletIds.includes(transferSelectionKey(row as WarehouseTransferOutboundCandidate))" @change="toggleTransferPallet(row as WarehouseTransferOutboundCandidate, $event)" /></template></el-table-column>
+            <el-table-column label="客户" min-width="180" show-overflow-tooltip><template #default="{ row }">{{ transferCustomerName(row as WarehouseTransferOutboundCandidate) }}</template></el-table-column>
+            <el-table-column prop="transferNo" label="转运单号" min-width="190" show-overflow-tooltip />
+            <el-table-column prop="packageCount" label="入库箱数" width="100" align="right" />
+            <el-table-column prop="volumeCbm" label="总体积(m³)" width="120" align="right" />
+            <el-table-column label="换标" width="110"><template #default="{ row }">{{ row.needRelabel ? `已换标${row.relabelNo ? ` · ${row.relabelNo}` : ''}` : '原箱出库' }}</template></el-table-column>
+            <el-table-column label="主单目的去向" min-width="240" show-overflow-tooltip><template #default="{ row }"><StatusBadge :status="transferHasDestination(row as WarehouseTransferOutboundCandidate) ? 'READY' : 'PENDING'" :label="transferDestinationLabel(row as WarehouseTransferOutboundCandidate)" /></template></el-table-column>
+          </el-table>
+          <div v-if="!inventoryLoading && !transferCandidates.length" class="form-hint">暂无已入库且尚无目的地的仓储转运单</div>
+        </el-form-item>
+        <el-form-item label="目的地类型" required><el-radio-group v-model="destinationType"><el-radio-button label="FBA">FBA目的仓</el-radio-button><el-radio-button label="PRIVATE">私人仓</el-radio-button></el-radio-group></el-form-item>
+        <el-form-item v-if="destinationType === 'FBA'" label="FBA目的仓" required><el-select v-model="selectedDestinationWarehouseId" filterable clearable placeholder="请选择FBA目的仓"><el-option v-for="item in fbaWarehouseOptions" :key="item.value" :value="item.value" :label="item.label" /></el-select></el-form-item>
+        <template v-else>
+          <el-form-item label="私人仓地址" required><el-input v-model="deliveryAddress" placeholder="请输入完整派送地址" /></el-form-item>
+          <el-form-item label="邮编" required><el-input v-model="postalCode" maxlength="32" placeholder="请输入邮编" /></el-form-item>
+          <el-form-item label="联系人" required><el-input v-model="contactName" placeholder="请输入联系人" /></el-form-item>
+          <el-form-item label="联系电话" required><el-input v-model="contactPhone" placeholder="请输入联系电话" /></el-form-item>
+        </template>
+      </template>
       <template v-else>
         <el-form-item label="收件信息" required><el-input v-model="recipient" placeholder="请输入收件人、电话和地址" /></el-form-item>
         <el-form-item label="海外仓" required><el-select v-model="selectedWarehouseId" :disabled="!selectedCustomerId" filterable placeholder="请选择海外仓" @change="loadReturnCandidates"><el-option v-for="item in warehouseOptions" :key="item.value" :value="item.value" :label="item.label" /></el-select></el-form-item>

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

@@ -259,8 +259,11 @@ describe('overseas warehouse first-batch prototype contract', () => {
     expect(dialog).toContain('排车明细已同步到预排列表')
     expect(dialog).toContain("router.push({ name: 'overseas-dispatches' })")
     expect(dialog).not.toContain('customerId:')
-    expect(dialog).toContain("planIds: planIds.value.length ? planIds.value.join(',') : undefined")
+    expect(dialog).toContain("planIds: query.sourceStage !== 'RELABEL' && planIds.value.length ? planIds.value.join(',') : undefined")
     expect(dialog).toContain('v-model="query.fbaWarehouseCode" clearable')
+    expect(dialog).toContain("订单号 / 换标单号 / 原入仓码")
+    expect(dialog).toContain('label="私人仓"')
+    expect(dialog).toContain('item.deliveryAddress, item.postalCode')
     expect(dialog).not.toContain(':model-value="fbaWarehouseCode" readonly')
     expect(dialog).toContain("sourceStage: 'RECEIVED'")
     expect(dialog).toContain('一次排车只能装同一客户的托盘')

src/modules/overseas-warehouse/types.ts

@@ -32,6 +32,7 @@ export interface LastMileOrderListItem {
   version: number
   pallets: number | '—'
   cartons: number | '—'
+  cartonDifference: number | '—'
   volume: number | '—'
   quantity: number | '—'
   volumeWeight: number | '—'
@@ -46,6 +47,7 @@ export interface LastMileOrderListItem {
   /** Read-only association fact; this module does not implement overseas delivery. */
   dispatchOrderNo: string
   relabelOrderNo: string
+  relabelStatusCode: string
   relabelStatus: string
   consolidated: string
   palletMergeFlag: string