merge origin/dev and resolve frontend conflicts

2026-09-08 20:33:45 +08:00
parent c3ae936caa 6b43583cad
commit d55cfb3737
84 changed files with 3008 additions and 277 deletions
@@ -26,6 +26,8 @@ export interface InboundOrderSummaryDto {
  inboundCode?: string | null
  lxCode?: string | null
  orderType?: string | null
+  overseasWarehouseCode?: string | null
+  overseasWarehouseName?: string | null
  warehouseId?: string | null
  warehouseCode?: string | null
  warehouseName?: string | null
@@ -27,6 +27,7 @@ export interface InboundPlanSummaryDto {
  inboundCode?: string | null
  containerNo?: string | null
  overseasWarehouseId?: string | null
+  overseasWarehouseCode?: string | null
  overseasWarehouseName?: string | null
  destinationWarehouseId?: string | null
  destinationWarehouseCode?: string | null
@@ -47,6 +48,8 @@ export interface InboundPlanDetailDto {
  customerId: string
  sourceOrderId: string
  containerNo?: string | null
+  overseasWarehouseCode?: string | null
+  overseasWarehouseName?: string | null
  status?: string | null
  lineCount: number
  palletCount: number
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { overseasHttp } from '@/shared/api/overseasHttp'
-import { convertLastMileContainerToInboundPlans, convertLastMileOrderToInboundPlan, downloadLastMileOrders, getContainerPlanProgress, getLastMileOrder, listContainerPlanProgress, listLastMileOrders, transferLastMileOrders } from './lastMileOrders'
+import { changeContainerReceivingWarehouse, convertLastMileContainerToInboundPlans, createManualInboundPlan, downloadLastMileOrders, getContainerPlanProgress, getLastMileOrder, getLastMileOrderManualNodes, listContainerPlanProgress, listLastMileOrders, transferLastMileOrders, updateLastMileOrderHold, updateLastMileOrderManualNodes } from './lastMileOrders'

 vi.mock('@/shared/api/overseasHttp', () => ({ overseasHttp: { get: vi.fn(), put: vi.fn(), post: vi.fn() } }))

@@ -84,12 +84,32 @@ describe('last-mile order overseas API', () => {
    })
  })

-  it('uses the inbound-plan conversion endpoint with the exact selected customer scope', async () => {
+  it('uses the manual inbound-plan endpoint with the complete form and idempotency evidence', async () => {
    vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: {} })
-    await convertLastMileOrderToInboundPlan({ orderId: '190000000000000099', customerId: '190000000000000001' })
-    expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/inbound-plans/convert', {
-      orderId: '190000000000000099', customerId: '190000000000000001',
-    })
+    const payload = { orderId: '190000000000000099', customerId: '190000000000000001', expectedOrderVersion: 4,
+      plannedArrivalDate: '2026-09-08', palletCount: 8, palletType: 'STANDARD' as const,
+      assigned: false, mergeRequired: false, urgent: true, remark: '加急' }
+    await createManualInboundPlan(payload, 'plan-key-1')
+    expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/inbound-plans/manual', payload,
+      { headers: { 'Idempotency-Key': 'plan-key-1' } })
+    expect(payload).not.toHaveProperty('inboundCode')
+    expect(payload).not.toHaveProperty('plannedWarehouseId')
+    expect(payload).not.toHaveProperty('plannedWarehouseCode')
+    expect(payload).not.toHaveProperty('plannedWarehouseName')
+  })
+
+  it('uses versioned idempotent order hold and complete manual-node snapshot endpoints', async () => {
+    vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', message: 'success', data: {} })
+    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', message: 'success', data: { nodes: [] } })
+    await updateLastMileOrderHold('190000000000000099', { held: true, chargeable: true, reason: '海关查验', expectedVersion: 4 }, 'hold-key-1')
+    expect(overseasHttp.put).toHaveBeenLastCalledWith('/platform/v1/last-leg/orders/190000000000000099/hold',
+      { held: true, chargeable: true, reason: '海关查验', expectedVersion: 4 }, { headers: { 'Idempotency-Key': 'hold-key-1' } })
+    await getLastMileOrderManualNodes('190000000000000099')
+    expect(overseasHttp.get).toHaveBeenLastCalledWith('/platform/v1/last-leg/orders/190000000000000099/manual-nodes')
+    const nodes = [{ nodeCode: 'ESTIMATED_ARRIVAL' as const, nodeAt: '2026-09-10T10:00:00' }]
+    await updateLastMileOrderManualNodes('190000000000000099', 5, nodes, 'node-key-1')
+    expect(overseasHttp.put).toHaveBeenLastCalledWith('/platform/v1/last-leg/orders/190000000000000099/manual-nodes',
+      { expectedVersion: 5, nodes }, { headers: { 'Idempotency-Key': 'node-key-1' } })
  })

  it('uses one atomic container request without looping individual conversions', async () => {
@@ -128,4 +148,17 @@ describe('last-mile order overseas API', () => {
    await expect(getContainerPlanProgress('2092873463568597001/unsafe')).resolves.toEqual(detail)
    expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/orders/container-summaries/2092873463568597001%2Funsafe')
  })
+
+  it('changes one whole container receiving warehouse with version and idempotency evidence', async () => {
+    const updated = { sourceContainerBookingId: '2092873463568597001', overseasWarehouseId: '9007199254740993' }
+    vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', message: 'success', data: updated })
+    await expect(changeContainerReceivingWarehouse('2092873463568597001/unsafe', {
+      overseasWarehouseId: '9007199254740993', expectedVersion: 7, remark: '改派洛杉矶接柜',
+    }, 'receiving-key-1')).resolves.toEqual(updated)
+    expect(overseasHttp.put).toHaveBeenCalledWith(
+      '/platform/v1/last-leg/orders/container-summaries/2092873463568597001%2Funsafe/receiving-warehouse',
+      { overseasWarehouseId: '9007199254740993', expectedVersion: 7, remark: '改派洛杉矶接柜' },
+      { headers: { 'Idempotency-Key': 'receiving-key-1' } },
+    )
+  })
 })
@@ -52,6 +52,8 @@ export interface LastMileOrderSummaryDto {
  sourceOrderNo?: string | null
  sourceInboundId?: string | null
  customerName?: string | null
+  overseasWarehouseId?: string | null
+  overseasWarehouseCode?: string | null
  overseasWarehouseName?: string | null
  transferWarehouseName?: string | null
  transferWarehouseId?: string | null
@@ -61,6 +63,11 @@ export interface LastMileOrderSummaryDto {
  containerStatus?: string | null
  abnormal?: boolean | null
  detained?: boolean | null
+  holdChargeable?: boolean | null
+  holdReason?: string | null
+  manualOverrideEnabled?: boolean | null
+  nodeSource?: 'CONTAINER' | 'MANUAL' | null
+  version?: number | null
  palletCount?: number | null
  packageCount?: number | null
  volumeCbm?: number | null
@@ -155,11 +162,6 @@ export interface TransferDestinationPayload {
  remark?: string
 }

-export interface ConvertInboundPlanPayload {
-  orderId: string
-  customerId: string
-}
-
 export interface ContainerPlanProgressQuery {
  page: number
  size: number
@@ -171,6 +173,12 @@ export interface ContainerPlanProgressQuery {
 export interface ContainerPlanProgressSummaryDto {
  sourceContainerBookingId: string
  containerNo: string | null
+  overseasWarehouseId: string | null
+  overseasWarehouseCode: string | null
+  overseasWarehouseName: string | null
+  assignmentVersion: number
+  canChangeReceivingWarehouse: boolean
+  receivingWarehouseLockReason: string | null
  totalOrderCount: number
  inboundCodeCount: number
  missingInboundCodeCount: number
@@ -204,8 +212,65 @@ export interface ConvertContainerInboundPlanPayload {
  sourceContainerBookingId: string
 }

+export type ManualNodeCode =
+  | 'DOMESTIC_CUSTOMS_COMPLETED'
+  | 'ESTIMATED_DEPARTURE'
+  | 'ACTUAL_DEPARTURE'
+  | 'ESTIMATED_ARRIVAL'
+  | 'OVERSEAS_CUSTOMS_COMPLETED'
+  | 'ACTUAL_ARRIVAL_WAITING_UNLOAD'
+  | 'PICKUP_APPOINTED'
+  | 'UNLOADED'
+
+export interface ManualInboundPlanPayload {
+  customerId: string
+  orderId: string
+  expectedOrderVersion: number
+  plannedArrivalDate: string
+  palletCount: number
+  palletType: 'STANDARD' | 'WOOD' | 'PAPER'
+  assigned: boolean
+  mergeRequired: boolean
+  urgent: boolean
+  remark?: string
+}
+
+export interface HoldLastMileOrderPayload {
+  held: boolean
+  chargeable: boolean
+  reason: string
+  expectedVersion: number
+}
+
+export interface HoldLastMileOrderResponse {
+  orderId: string
+  held: boolean
+  chargeable: boolean
+  reason?: string | null
+  version: number
+}
+
+export interface ManualNodeValue {
+  nodeCode: ManualNodeCode
+  nodeAt: string | null
+}
+
+export interface ManualNodesResponse {
+  orderId: string
+  manualOverrideEnabled: boolean
+  nodes: Array<ManualNodeValue & { source: 'MANUAL' }>
+  version: number
+}
+
+export interface ChangeContainerReceivingWarehousePayload {
+  overseasWarehouseId: string
+  expectedVersion: number
+  remark?: string
+}
+
 export interface LastMileOrderDetailDto {
  order: LastMileOrderDto
+  manualNodes?: ManualNodesResponse['nodes']
  cargo: LastMileCargoDto[]
  statusHistory: LastMileStatusHistoryDto[]
  fees: LastMileFeeDto[]
@@ -264,13 +329,6 @@ export async function transferLastMileOrders(payload: TransferDestinationPayload
  return unwrapApiResponse(response)
 }

-export async function convertLastMileOrderToInboundPlan(payload: ConvertInboundPlanPayload) {
-  const response = await overseasHttp.post<ApiEnvelope<unknown>, ApiEnvelope<unknown>>(
-    '/platform/v1/last-leg/inbound-plans/convert', payload,
-  )
-  return unwrapApiResponse(response)
-}
-
 export async function listContainerPlanProgress(query: ContainerPlanProgressQuery): Promise<OverseasPageResult<ContainerPlanProgressSummaryDto>> {
  const response = await overseasHttp.get<ApiEnvelope<OverseasPagePayload<ContainerPlanProgressSummaryDto>>, ApiEnvelope<OverseasPagePayload<ContainerPlanProgressSummaryDto>>>(
    '/platform/v1/last-leg/orders/container-summaries',
@@ -286,6 +344,56 @@ export async function getContainerPlanProgress(sourceContainerBookingId: string)
  return unwrapApiResponse(response)
 }

+export async function createManualInboundPlan(payload: ManualInboundPlanPayload, idempotencyKey: string) {
+  const response = await overseasHttp.post<ApiEnvelope<InboundPlanDetailDto>, ApiEnvelope<InboundPlanDetailDto>>(
+    '/platform/v1/last-leg/inbound-plans/manual', payload,
+    { headers: { 'Idempotency-Key': idempotencyKey } },
+  )
+  return unwrapApiResponse(response)
+}
+
+export async function updateLastMileOrderHold(orderId: string, payload: HoldLastMileOrderPayload, idempotencyKey: string) {
+  const response = await overseasHttp.put<ApiEnvelope<HoldLastMileOrderResponse>, ApiEnvelope<HoldLastMileOrderResponse>>(
+    `/platform/v1/last-leg/orders/${encodeURIComponent(orderId)}/hold`, payload,
+    { headers: { 'Idempotency-Key': idempotencyKey } },
+  )
+  return unwrapApiResponse(response)
+}
+
+export async function getLastMileOrderManualNodes(orderId: string) {
+  const response = await overseasHttp.get<ApiEnvelope<ManualNodesResponse>, ApiEnvelope<ManualNodesResponse>>(
+    `/platform/v1/last-leg/orders/${encodeURIComponent(orderId)}/manual-nodes`,
+  )
+  return unwrapApiResponse(response)
+}
+
+export async function updateLastMileOrderManualNodes(
+  orderId: string,
+  expectedVersion: number,
+  nodes: ManualNodeValue[],
+  idempotencyKey: string,
+) {
+  const response = await overseasHttp.put<ApiEnvelope<ManualNodesResponse>, ApiEnvelope<ManualNodesResponse>>(
+    `/platform/v1/last-leg/orders/${encodeURIComponent(orderId)}/manual-nodes`,
+    { expectedVersion, nodes },
+    { headers: { 'Idempotency-Key': idempotencyKey } },
+  )
+  return unwrapApiResponse(response)
+}
+
+export async function changeContainerReceivingWarehouse(
+  sourceContainerBookingId: string,
+  payload: ChangeContainerReceivingWarehousePayload,
+  idempotencyKey: string,
+) {
+  const response = await overseasHttp.put<ApiEnvelope<ContainerPlanProgressSummaryDto>, ApiEnvelope<ContainerPlanProgressSummaryDto>>(
+    `/platform/v1/last-leg/orders/container-summaries/${encodeURIComponent(sourceContainerBookingId)}/receiving-warehouse`,
+    payload,
+    { headers: { 'Idempotency-Key': idempotencyKey } },
+  )
+  return unwrapApiResponse(response)
+}
+
 export async function convertLastMileContainerToInboundPlans(payload: ConvertContainerInboundPlanPayload) {
  const response = await overseasHttp.post<ApiEnvelope<InboundPlanDetailDto[]>, ApiEnvelope<InboundPlanDetailDto[]>>(
    '/platform/v1/last-leg/inbound-plans/convert-container', payload,
@@ -4,8 +4,19 @@ import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrder
 import type { DeliveryOrderRow } from './deliveryOrders'

 export interface OutboundRow { id: string; outboundNo: string; dispatchNo?: string | null; overseasWarehouseId?: string | null; lxCodes?: string | null; status?: string | null; palletCount?: number | null; packageCount?: number | null; createdAt?: string | null }
-export interface OutboundPalletRow { id: string; palletNo?: string | null; cartonMarks?: string | null; skuCode?: string | null; inboundCode?: string | null; packageCount?: number | null; pickedPackageCount?: number | null; status?: string | null }
-export interface OutboundDetail { outbound: OutboundRow; delivery?: DeliveryOrderRow | null; pallets?: OutboundPalletRow[] }
+export interface OutboundPalletRow {
+  id?: string | null
+  palletNo?: string | null
+  cartonMarks?: string | null
+  inboundCode?: string | null
+  destinationWarehouseCode?: string | null
+  destinationWarehouseName?: string | null
+  skuCode?: string | null
+  packageCount?: number | null
+  pickedPackageCount?: number | null
+  status?: string | null
+}
+export interface OutboundDetail { outbound: OutboundRow; pallets?: OutboundPalletRow[]; delivery?: DeliveryOrderRow | null }
 export interface OutboundQuery { page: number; size: number; documentNo?: string; lxCode?: string; warehouseId?: string; status?: 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 })
@@ -125,6 +125,7 @@ async function movePallet(item: DispatchPalletCandidateDto, containerId: string)
  const id = palletId(item)
  const target = containers.value.find((container) => container.id === containerId)
  if (!target || target.palletIds.includes(id)) return
+  if (!String(item.overseasWarehouseId || '').trim()) { ElMessage.warning('该托盘尚未关联海外仓，不能排车'); return }
  if (containerFor(id)) { ElMessage.warning('该托盘已在其他装车托盘中'); return }
  if (target.palletIds.length >= target.capacity) { ElMessage.warning('该装车托盘已达到设置的托数'); return }
  const nextWeight = containerWeightLb(target) + weightLb(item)
@@ -171,6 +172,7 @@ async function close(value = false) {

 async function submit() {
  if (!assignedIds.value.length) { ElMessage.warning('请至少移入一个托盘'); return }
+  if (assigned.value.some((item) => !String(item.overseasWarehouseId || '').trim())) { ElMessage.warning('所选托盘中存在尚未关联海外仓的托盘'); return }
  saving.value = true; mutationError.value = null
  try {
    await preArrangeDispatch({ planPalletIds: assignedIds.value, draftToken: ensureDraftToken() })
@@ -52,6 +52,17 @@ describe('last-mile order presentation adapter', () => {
    }).owner).toBe('—')
  })

+  it('preserves the frozen overseas receiving warehouse id and code as strings', () => {
+    const row = toLastMileOrderListItem({
+      id: '190000000000000099', customerId: '190000000000000001', orderNo: 'LMO-260908-0001',
+      overseasWarehouseId: '190000000000000123', overseasWarehouseCode: 'LAX01', overseasWarehouseName: '洛杉矶接柜仓',
+    })
+
+    expect(row.overseasWarehouseId).toBe('190000000000000123')
+    expect(row.overseasWarehouseCode).toBe('LAX01')
+    expect(row.warehouse).toBe('洛杉矶接柜仓')
+  })
+
  it('preserves the exact server LMO short number without padding, prefixing or deriving it from id', () => {
    const serverOrderNo = 'LMO-9A7'
    const row = toLastMileOrderListItem({ id: '2092873463568596994', customerId: '100', orderNo: serverOrderNo })
@@ -106,6 +106,8 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
    inboundCode: text(dto.inboundCode),
    lxCode: text(dto.lxCode),
    owner: text(dto.customerName),
+    overseasWarehouseId: String(dto.overseasWarehouseId ?? '').trim(),
+    overseasWarehouseCode: String(dto.overseasWarehouseCode ?? '').trim(),
    warehouse: text(dto.overseasWarehouseName),
    transferWarehouse: text(dto.transferWarehouseName),
    fbaWarehouse: text(dto.fbaWarehouseCode),
@@ -113,6 +115,11 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
    containerStatus: text(dto.containerStatus),
    abnormal: yesNo(dto.abnormal),
    held: yesNo(dto.detained),
+    detained: Boolean(dto.detained),
+    holdChargeable: Boolean(dto.holdChargeable),
+    holdReason: String(dto.holdReason ?? '').trim(),
+    manualNodeOverride: Boolean(dto.manualOverrideEnabled),
+    version: Number(dto.version ?? 0),
    pallets: metric(dto.palletCount),
    cartons: metric(dto.packageCount),
    volume: metric(dto.volumeCbm),
@@ -8,13 +8,13 @@ const component = (name: string) => readFileSync(resolve(process.cwd(), 'src/mod
 describe('overseas warehouse 1920px layout acceptance', () => {
  it('keeps action columns first and wide enough for every visible action', () => {
    const widths: Record<string, number> = {
-      'LastMileOrdersView.vue': 270,
-      'InboundOrdersView.vue': 190,
-      'DispatchesView.vue': 240,
-      'OutboundsView.vue': 190,
+      'LastMileOrdersView.vue': 178,
+      'InboundOrdersView.vue': 300,
+      'DispatchesView.vue': 270,
+      'OutboundsView.vue': 180,
      'DeliveryOrdersView.vue': 300,
-      'RelabelOrdersView.vue': 190,
-      'PalletsView.vue': 250,
+      'RelabelOrdersView.vue': 180,
+      'PalletsView.vue': 180,
      'InventoryView.vue': 110,
    }
    for (const [name, width] of Object.entries(widths)) {
@@ -25,6 +25,14 @@ describe('overseas warehouse 1920px layout acceptance', () => {
    }
  })

+  it('keeps all inbound-order row actions on one line', () => {
+    const source = page('InboundOrdersView.vue')
+    expect(source).toContain('<template #actions="{ row }"><div class="row-actions">')
+    expect(source).toContain('.row-actions { display: inline-flex; min-width: max-content; align-items: center; flex-wrap: nowrap; gap: 8px; white-space: nowrap; }')
+    expect(source).toContain('.row-actions :deep(.el-button) { flex: 0 0 auto; }')
+    expect(source).toContain('.row-actions :deep(.el-button + .el-button) { margin-left: 0; }')
+  })
+
  it('assigns explicit desktop widths to dense query inputs', () => {
    for (const name of ['LastMileOrdersView.vue', 'InboundOrdersView.vue', 'OutboundsView.vue', 'DeliveryOrdersView.vue', 'RelabelOrdersView.vue', 'PalletsView.vue', 'InventoryView.vue']) {
      const source = page(name)
@@ -58,5 +66,13 @@ describe('overseas warehouse 1920px layout acceptance', () => {
    expect(page('PalletsView.vue')).toContain('.el-form :deep(.el-input-number) { width: 100%; }')
    expect(page('RelabelOrdersView.vue')).toContain('.el-form :deep(.el-row) { margin-left: 0 !important; margin-right: 0 !important; }')
    expect(page('PalletsView.vue')).toContain('.el-form :deep(.el-row) { margin-left: 0 !important; margin-right: 0 !important; }')
+    const lastMileDetail = page('LastMileOrderDetailView.vue')
+    expect(lastMileDetail).toContain('class="fee-form-grid"')
+    expect(lastMileDetail).toContain('filterable allow-create clearable default-first-option')
+    expect(lastMileDetail).toContain('.fee-form { min-width: 0; overflow-x: hidden; }')
+    expect(lastMileDetail).toContain('.fee-form :deep(.el-select), .fee-form :deep(.el-input-number) { width: 100%; }')
+    expect(lastMileDetail).toContain("field.label === '入仓码' || field.label === '集装箱号'")
+    expect(lastMileDetail).toContain(':title="isSingleLineBusinessField(field) ? String(field.value) : undefined"')
+    expect(lastMileDetail).toContain('.detail-field-value--business { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }')
  })
 })
@@ -163,7 +163,7 @@ onMounted(load)
          <div><strong>{{ summary.pending }}</strong><span>待回访</span></div>
          <div><strong>{{ summary.completed }}</strong><span>已完成回访</span></div>
        </section>
-        <QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="客户回访筛选" preference-key="overseas-customer-visits-query" @search="search" @reset="reset" />
+        <QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="客户回访筛选" preference-key="overseas-customer-visits-query" :search-on-reset="false" @search="search" @reset="reset" />
      </template>
      <template v-if="error" #state><LoadErrorState title="客户回访列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
      <section v-if="!error" class="surface-panel table-panel">
@@ -17,7 +17,10 @@ describe('DeliveryOrderDetailView', () => {
        status: 'DELIVERING', overseasWarehouseName: '洛杉矶仓', palletCount: 1, packageCount: 2,
        createdAt: '2026-09-01T10:00:00',
      },
-      skus: [], fees: [], operations: [],
+      skus: [], fees: [
+        { id: 'fee-private', feeDirection: 'RECEIVABLE', feeType: 'PRIVATE_LAST_MILE_DELIVERY', currency: 'USD', amount: 88 },
+        { id: 'fee-delivery', feeDirection: 'RECEIVABLE', feeType: 'DELIVERY_FEE', currency: 'USD', amount: 66 },
+      ], operations: [],
    })
  })

@@ -28,6 +31,9 @@ describe('DeliveryOrderDetailView', () => {
    expect(wrapper.text()).toContain('DEL/1')
    expect(wrapper.text()).toContain('派送中')
    expect(wrapper.text()).toContain('洛杉矶仓')
+    await wrapper.find('.el-tabs__item:nth-child(3)').trigger('click')
+    expect(wrapper.text()).toContain('私人仓尾程派送费')
+    expect(wrapper.text()).toContain('派送费用')
    wrapper.unmount()
  })

@@ -24,7 +24,7 @@ const statusLabels: Record<string, string> = { WAIT_DELIVERY: '待派送', DELIV
 const methodLabels: Record<string, string> = { FBA_PICKUP: 'FBA自提', CUSTOMER_PICKUP: '客户自提', TRUCK: '卡车派送', TRUCK_PALLET: '卡派打托', TRUCK_FLOOR: '卡派地板', EXPRESS: '快递', OUTSOURCED: '外配', DEDICATED_TRUCK: '专车直送', LTL: '零担派送', SELF_DELIVERY: '自送', THIRD_PARTY: '第三方配送' }
 const pickupLabels: Record<string, string> = { ONE_PICKUP_ONE_DROP: '一提一卸', ONE_PICKUP_MULTI_DROP: '一提多卸', MULTI_PICKUP_ONE_DROP: '多提一卸', MULTI_PICKUP_MULTI_DROP: '多提多卸', WAREHOUSE_PICKUP: '仓库自提', DOOR_PICKUP: '上门提货', SELF_PICKUP: '自提' }
 const loadingLabels: Record<string, string> = { PALLET: '托盘', FLOOR: '地板', MIXED: '混装', CARTON: '散箱' }
-const feeLabels: Record<string, string> = { DELIVERY_FEE: '派送费用', EXPRESS_FEE: '快递费用', LOADING_FEE: '装车费', APPOINTMENT_FEE: '买约费用', OTHER: '其他费用' }
+const feeLabels: Record<string, string> = { DELIVERY_FEE: '派送费用', PRIVATE_LAST_MILE_DELIVERY: '私人仓尾程派送费', EXPRESS_FEE: '快递费用', LOADING_FEE: '装车费', APPOINTMENT_FEE: '买约费用', OTHER: '其他费用' }
 const operationLabels: Record<string, string> = { CREATE_DELIVERY: '创建派送单', ASSIGN_VEHICLE: '车队分配', DISPATCH: '开始派送', SIGN: '签收', COMPLETE_DELIVERY: '完成派送', UPDATE_DELIVERY_STATUS: '更新派送状态', CUSTOMER_VISIT: '客户回访', MARK_RETURN: '标记退货', CANCEL_OUTBOUND: '取消出库' }
 const resultLabels: Record<string, string> = { CREATED: '已创建' }

@@ -78,6 +78,6 @@ function reset(model: QueryModel) { page.value = 1; void load(model) }
 async function loadWarehouses() { if (!access.can(permission.warehouseList)) return; warehousesLoading.value = true; try { warehouses.value = (await listReceivingOverseasWarehouses()).records } catch { warehouses.value = [] } finally { warehousesLoading.value = false } }
 onMounted(() => { void load(); void loadWarehouses() })
 </script>
-<template><AdminPage><ListPageLayout aria-label="派送单列表"><template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="派送单筛选" preference-key="overseas-delivery-orders-query" @search="search" @reset="reset" /></template><template v-if="error" #state><LoadErrorState title="派送单列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template><section v-if="!error" 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-delivery-orders" row-key="id" empty-text="暂无派送单" @update:page="load()" @update:page-size="page = 1; load()"><template #actions="{ row }"><el-button size="small" type="primary" plain @click="open(row as DeliveryOrderRow)"><Eye :size="15" />详情</el-button><el-button v-if="access.can(permission.deliveryStatus) && row.status !== 'RETURN_PENDING'" size="small" plain @click="openStatus(row as DeliveryOrderRow)"><Pencil :size="15" />编辑状态</el-button><el-button v-if="access.can(permission.deliveryReturn) && !['RETURN_PENDING','CANCELLED'].includes(String(row.status))" size="small" type="warning" plain @click="openReturn(row as DeliveryOrderRow)"><RotateCcw :size="15" />标记退货</el-button></template><template #status="{ row }"><StatusBadge :status="statusLabels[String(row.status)] || String(row.status || '—')" /></template><template #pagination-left>共 {{ total }} 条派送单</template></DataTable></section></ListPageLayout></AdminPage><AppDialog v-model="statusOpen" title="编辑派送状态" width="min(520px, calc(100vw - 28px))" confirm-text="保存状态" :confirm-loading="statusSaving" @confirm="submitStatus"><el-form label-position="top"><el-form-item label="派送单号"><el-input :model-value="statusRow?.deliveryNo" readonly /></el-form-item><el-form-item label="派送状态" required><el-select v-model="statusForm.status" placeholder="请选择派送状态"><el-option label="待派送" value="WAIT_DELIVERY" /><el-option label="派送中" value="DELIVERING" /><el-option label="派送完成" value="DELIVERED" /><el-option label="已拒签" value="REJECTED" /><el-option label="已取消" value="CANCELLED" /></el-select></el-form-item><el-form-item label="备注"><el-input v-model="statusForm.remark" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="请输入状态备注（选填）" /></el-form-item><el-alert v-if="statusForm.status === 'DELIVERED'" title="保存为派送完成后，将自动生成一条待回访记录。" type="info" :closable="false" /></el-form></AppDialog><AppDialog v-model="returnOpen" title="标记退货" width="min(720px, calc(100vw - 28px))" confirm-text="确认转入退货" :loading="returnLoading" :confirm-loading="returnSaving" @confirm="submitReturn"><el-form label-position="top"><el-form-item label="派送单号"><el-input :model-value="returnRow?.deliveryNo" readonly /></el-form-item><el-form-item label="对应入仓单" required><el-select v-model="returnForm.inboundOrderId" placeholder="请选择该派送单对应的入仓单"><el-option v-for="option in returnOptions" :key="String(option.inboundOrderId)" :value="String(option.inboundOrderId)" :label="`${option.inboundCode} · ${option.lastMileOrderNo || '无尾程单号'}`" /></el-select></el-form-item><el-form-item label="退货原因" required><el-input v-model="returnForm.reason" type="textarea" :rows="4" maxlength="1000" show-word-limit placeholder="请输入退货原因" /></el-form-item><div class="return-grid"><el-form-item label="退货去向" required><el-select v-model="returnForm.returnDirection" placeholder="请选择退货去向"><el-option label="退回海外仓" value="OVERSEAS_WAREHOUSE" /><el-option label="退回客户" value="CUSTOMER" /><el-option label="其他" value="OTHER" /></el-select></el-form-item><el-form-item label="退回物流单号"><el-input v-model="returnForm.returnLogisticsNo" placeholder="可安排物流后补充" /></el-form-item><el-form-item label="箱数"><el-input-number v-model="returnForm.packageCount" :min="1" placeholder="请输入退货箱数（选填）" /></el-form-item><el-form-item label="SKU（可自由填写）"><el-input v-model="returnForm.skuCode" placeholder="请输入SKU（选填）" /></el-form-item></div><el-alert title="确认后会生成异常退货单，并将派送单标记为退货处理中。" type="warning" :closable="false" /></el-form></AppDialog></template>
+<template><AdminPage><ListPageLayout aria-label="派送单列表"><template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="派送单筛选" preference-key="overseas-delivery-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template><template v-if="error" #state><LoadErrorState title="派送单列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template><section v-if="!error" 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-delivery-orders" row-key="id" empty-text="暂无派送单" @update:page="load()" @update:page-size="page = 1; load()"><template #actions="{ row }"><el-button size="small" type="primary" plain @click="open(row as DeliveryOrderRow)"><Eye :size="15" />详情</el-button><el-button v-if="access.can(permission.deliveryStatus) && row.status !== 'RETURN_PENDING'" size="small" plain @click="openStatus(row as DeliveryOrderRow)"><Pencil :size="15" />编辑状态</el-button><el-button v-if="access.can(permission.deliveryReturn) && !['RETURN_PENDING','CANCELLED'].includes(String(row.status))" size="small" type="warning" plain @click="openReturn(row as DeliveryOrderRow)"><RotateCcw :size="15" />标记退货</el-button></template><template #status="{ row }"><StatusBadge :status="statusLabels[String(row.status)] || String(row.status || '—')" /></template><template #pagination-left>共 {{ total }} 条派送单</template></DataTable></section></ListPageLayout></AdminPage><AppDialog v-model="statusOpen" title="编辑派送状态" width="min(520px, calc(100vw - 28px))" confirm-text="保存状态" :confirm-loading="statusSaving" @confirm="submitStatus"><el-form label-position="top"><el-form-item label="派送单号"><el-input :model-value="statusRow?.deliveryNo" readonly /></el-form-item><el-form-item label="派送状态" required><el-select v-model="statusForm.status" placeholder="请选择派送状态"><el-option label="待派送" value="WAIT_DELIVERY" /><el-option label="派送中" value="DELIVERING" /><el-option label="派送完成" value="DELIVERED" /><el-option label="已拒签" value="REJECTED" /><el-option label="已取消" value="CANCELLED" /></el-select></el-form-item><el-form-item label="备注"><el-input v-model="statusForm.remark" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="请输入状态备注（选填）" /></el-form-item><el-alert v-if="statusForm.status === 'DELIVERED'" title="保存为派送完成后，将自动生成一条待回访记录。" type="info" :closable="false" /></el-form></AppDialog><AppDialog v-model="returnOpen" title="标记退货" width="min(720px, calc(100vw - 28px))" confirm-text="确认转入退货" :loading="returnLoading" :confirm-loading="returnSaving" @confirm="submitReturn"><el-form label-position="top"><el-form-item label="派送单号"><el-input :model-value="returnRow?.deliveryNo" readonly /></el-form-item><el-form-item label="对应入仓单" required><el-select v-model="returnForm.inboundOrderId" placeholder="请选择该派送单对应的入仓单"><el-option v-for="option in returnOptions" :key="String(option.inboundOrderId)" :value="String(option.inboundOrderId)" :label="`${option.inboundCode} · ${option.lastMileOrderNo || '无尾程单号'}`" /></el-select></el-form-item><el-form-item label="退货原因" required><el-input v-model="returnForm.reason" type="textarea" :rows="4" maxlength="1000" show-word-limit placeholder="请输入退货原因" /></el-form-item><div class="return-grid"><el-form-item label="退货去向" required><el-select v-model="returnForm.returnDirection" placeholder="请选择退货去向"><el-option label="退回海外仓" value="OVERSEAS_WAREHOUSE" /><el-option label="退回客户" value="CUSTOMER" /><el-option label="其他" value="OTHER" /></el-select></el-form-item><el-form-item label="退回物流单号"><el-input v-model="returnForm.returnLogisticsNo" placeholder="可安排物流后补充" /></el-form-item><el-form-item label="箱数"><el-input-number v-model="returnForm.packageCount" :min="1" placeholder="请输入退货箱数（选填）" /></el-form-item><el-form-item label="SKU（可自由填写）"><el-input v-model="returnForm.skuCode" placeholder="请输入SKU（选填）" /></el-form-item></div><el-alert title="确认后会生成异常退货单，并将派送单标记为退货处理中。" type="warning" :closable="false" /></el-form></AppDialog></template>

 <style scoped>.return-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 18px; }.return-grid :deep(.el-input),.return-grid :deep(.el-select),.return-grid :deep(.el-input-number){width:100%} @media (max-width: 720px) { .return-grid { grid-template-columns: 1fr; } }</style>
@@ -74,7 +74,7 @@ const fields = computed<QueryField[]>(() => [
 ])

 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 240, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 270, fixed: 'left', slotName: 'actions' },
  { key: 'dispatchNo', prop: 'dispatchNo', label: '排车单号', minWidth: 170, fixed: 'left' },
  { key: 'vehiclePlate', prop: 'vehiclePlate', label: '车牌号', minWidth: 130 },
  { key: 'driverName', prop: 'driverName', label: '司机', minWidth: 120 },
@@ -216,7 +216,7 @@ onMounted(load)
 <template>
  <AdminPage><ListPageLayout aria-label="海外仓排车列表">
    <OperationErrorToast :details="mutationError" />
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="排车列表筛选" preference-key="overseas-dispatches-query" @search="search" @reset="reset" /></template>
+    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="排车列表筛选" preference-key="overseas-dispatches-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
    <template v-if="loadError" #state><LoadErrorState title="排车列表加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
    <section v-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-dispatches" row-key="id" empty-text="暂无排车记录" @update:page="load()" @update:page-size="page = 1; load()">
       <template #actions="{ row }"><el-button size="small" plain type="primary" @click="openDetail(row as DispatchListItem)"><Eye :size="15" />查看</el-button><el-button v-if="canTransfer(row as DispatchListItem)" size="small" type="success" plain @click="openTransfer(row as DispatchListItem)"><Truck :size="15" />转派送</el-button><el-dropdown v-if="canEdit(row as DispatchListItem) || canCancel(row as DispatchListItem)" trigger="click" @command="handleMore(String($event), row as DispatchListItem)"><el-button size="small" plain><MoreHorizontal :size="15" />更多</el-button><template #dropdown><el-dropdown-menu><el-dropdown-item v-if="canEdit(row as DispatchListItem)" command="edit"><Pencil :size="15" />编辑</el-dropdown-item><el-dropdown-item v-if="canCancel(row as DispatchListItem)" command="cancel" divided><XCircle :size="15" />取消</el-dropdown-item></el-dropdown-menu></template></el-dropdown></template>
@@ -77,7 +77,7 @@ onMounted(load)

 <template>
  <AdminPage><ListPageLayout aria-label="异常订单列表">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="异常订单筛选" preference-key="overseas-exception-orders-query" @search="search" @reset="reset" /></template>
+    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="异常订单筛选" preference-key="overseas-exception-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
    <template v-if="error" #state><LoadErrorState title="异常订单列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
    <section v-if="!error" 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-exception-orders" row-key="id" empty-text="暂无异常订单" @update:page="load()" @update:page-size="page = 1; load()">
      <template #toolbar-actions><el-button v-if="access.can(permission.exceptionOrderCreate)" type="primary" @click="openCreate"><Plus :size="16" />新增异常订单</el-button></template>
@@ -13,11 +13,16 @@ const planNo = computed(() => String(route.params.orderId || ''))
 const customerId = computed(() => String(route.query.customerId || ''))
 const detail = ref<InboundPlanDetailDto | null>(null); const loading = ref(false); const loadError = ref<ApiErrorDetails | null>(null)
 function text(value: unknown) { return String(value ?? '').trim() || '—' }
+function receivingWarehouse(code: unknown, name: unknown) {
+  const normalizedCode = String(code ?? '').trim()
+  const normalizedName = String(name ?? '').trim()
+  return normalizedCode && normalizedName ? `${normalizedCode} · ${normalizedName}` : '—'
+}
 function status(value: unknown) { const labels: Record<string, string> = { PENDING_ASSIGNMENT: '待入库', PDA_PENDING: '待入库', ASSIGNED: '待入库', PICKING: '拣货中', PARTIAL_INBOUND: '部分入库', COMPLETED: '全部入库' }; return labels[String(value || '')] || text(value) }
 const firstLine = computed(() => detail.value?.lines[0])
 const fieldValues = computed<Record<string, string | number>>(() => ({
-  入库单号: text(detail.value?.planNo), 入仓码: text(firstLine.value?.inboundCode), 类型: '—', 货主: '—', 关联订单: text(detail.value?.sourceOrderId),
-  海外仓: text(firstLine.value?.destinationWarehouseName), FBA仓库: text(firstLine.value?.fbaWarehouseCode), 总箱数: detail.value?.expectedPackageCount ?? detail.value?.lines.reduce((sum, line) => sum + line.requiredPackageCount, 0) ?? 0,
+  入库单号: text(detail.value?.planNo), 入仓码: text(firstLine.value?.inboundCode), 类型: '—', 货主: '—', 关联订单: '—',
+  海外仓: receivingWarehouse(detail.value?.overseasWarehouseCode, detail.value?.overseasWarehouseName), FBA仓库: text(firstLine.value?.fbaWarehouseCode), 总箱数: detail.value?.expectedPackageCount ?? detail.value?.lines.reduce((sum, line) => sum + line.requiredPackageCount, 0) ?? 0,
  应拣货数: detail.value?.expectedPackageCount ?? detail.value?.lines.reduce((sum, line) => sum + line.requiredPackageCount, 0) ?? 0, 实际拣货数: detail.value?.pickedPackageCount ?? detail.value?.allocations.reduce((sum, item) => sum + item.pickedPackageCount, 0) ?? 0,
  '计费体积(m³)': Number(detail.value?.totalVolumeCbm || 0), 总托盘数: Number(detail.value?.palletCount || 0), 状态: status(detail.value?.status),
  预约状态: '—', 预约送仓时间: '—', 预计装车时间: '—', 排车状态: '—', 创建时间: '—', 更新时间: '—', 备注: '—',
@@ -60,11 +60,11 @@ function selectableRow(source: object) {
  const row = source as InboundOrderListItem
  if (!row.fbaWarehouse || row.fbaWarehouse === '—') return false
  const anchor = selectedRows.value[0]
-  return !anchor || anchor.fbaWarehouse === row.fbaWarehouse
+  return !anchor || (anchor.customerId === row.customerId && anchor.fbaWarehouse === row.fbaWarehouse)
 }

 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 190, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 300, fixed: 'left', slotName: 'actions' },
  { key: 'selection', type: 'selection', width: 48, fixed: 'left', selectable: selectableRow },
  { key: 'orderNo', prop: 'orderNo', label: '入库单号', minWidth: 170 },
  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140 },
@@ -84,6 +84,11 @@ const columns: DataTableColumn[] = [
 ]

 function text(value: unknown) { const normalized = String(value ?? '').trim(); return normalized || '—' }
+function receivingWarehouse(code: unknown, name: unknown) {
+  const normalizedCode = String(code ?? '').trim()
+  const normalizedName = String(name ?? '').trim()
+  return normalizedCode && normalizedName ? `${normalizedCode} · ${normalizedName}` : '—'
+}
 function number(value: unknown) { const normalized = Number(value); return Number.isFinite(normalized) ? normalized : 0 }
 function typeLabel(value: unknown) { return lastMileOrderTypeLabel(value) }
 function planStatusLabel(value: unknown) { return ({ PENDING_ASSIGNMENT: '待入库', ASSIGNED: '待入库', PDA_PENDING: '待入库', PICKING: '拣货中', COMPLETED: '全部入库', PARTIAL_INBOUND: '部分入库' } as Record<string, string>)[String(value || '')] || text(value) }
@@ -92,8 +97,8 @@ function appointmentStatusLabel(value: unknown) { return !value ? '未预约' :
 function toListItem(dto: InboundOrderSummaryDto): InboundOrderListItem {
  return {
    lineId: String(dto.lineId), planId: String(dto.planId), customerId: String(dto.customerId), orderId: String(dto.orderId),
-    warehouseId: text(dto.warehouseId) === '—' ? '' : String(dto.warehouseId), destinationWarehouseCode: text(dto.warehouseCode),
-    orderNo: text(dto.planNo), inboundCode: text(dto.inboundCode), lxCode: text(dto.lxCode), type: typeLabel(dto.orderType), warehouse: text(dto.warehouseName || dto.warehouseCode),
+    warehouseId: text(dto.warehouseId) === '—' ? '' : String(dto.warehouseId), destinationWarehouseCode: text(dto.warehouseCode), destinationWarehouseName: text(dto.warehouseName),
+    orderNo: text(dto.planNo), inboundCode: text(dto.inboundCode), lxCode: text(dto.lxCode), type: typeLabel(dto.orderType), warehouse: receivingWarehouse(dto.overseasWarehouseCode, dto.overseasWarehouseName),
    fbaWarehouse: text(dto.fbaWarehouseCode), owner: text(dto.customerName), cartons: number(dto.packageCount), pickedCartons: number(dto.pickedPackageCount), volume: number(dto.volumeCbm), pallets: number(dto.palletCount),
    status: planStatusLabel(dto.status), appointmentNo: text(dto.appointmentNo), appointmentStatus: appointmentStatusLabel(dto.appointmentStatus),
    appointmentAt: formatOverseasDateTime(dto.appointmentAt), expectedLoadingAt: formatOverseasDateTime(dto.expectedLoadingAt), dispatchStatus: dto.dispatchStatus === 'SCHEDULED' ? '已排车' : '未排车',
@@ -172,18 +177,18 @@ async function load(model: QueryModel = filters.value) {
 function search(model: QueryModel) { page.value = 1; void load(model) }
 function reset(model: QueryModel) { page.value = 1; void load(model) }
 function openDetail(source: object) { const row = source as InboundOrderListItem; void router.push({ name: 'overseas-inbound-order-detail', params: { orderId: row.orderNo }, query: { customerId: row.customerId } }) }
-async function openPlanEdit(source: object) { const row = source as InboundOrderListItem; planEditTarget.value = row; planEditOpen.value = true; planEditLoading.value = true; mutationError.value = null; try { Object.assign(planEditForm, { warehouseId: row.warehouseId, warehouseCode: row.destinationWarehouseCode === '—' ? '' : row.destinationWarehouseCode, warehouseName: row.warehouse, version: row.version }); if (!warehouses.value.length) warehouses.value = (await listReceivingOverseasWarehouses()).records } catch (error) { planEditOpen.value = false; mutationError.value = getApiErrorDetails(error, '海外仓列表加载失败，请重试') } finally { planEditLoading.value = false } }
+async function openPlanEdit(source: object) { const row = source as InboundOrderListItem; planEditTarget.value = row; planEditOpen.value = true; planEditLoading.value = true; mutationError.value = null; try { Object.assign(planEditForm, { warehouseId: row.warehouseId, warehouseCode: row.destinationWarehouseCode === '—' ? '' : row.destinationWarehouseCode, warehouseName: row.destinationWarehouseName === '—' ? '' : row.destinationWarehouseName, version: row.version }); if (!warehouses.value.length) warehouses.value = (await listReceivingOverseasWarehouses()).records } catch (error) { planEditOpen.value = false; mutationError.value = getApiErrorDetails(error, '海外仓列表加载失败，请重试') } finally { planEditLoading.value = false } }
 async function submitPlanEdit() { const target = planEditTarget.value; if (!target || !planEditForm.warehouseId) { ElMessage.warning('请选择目的仓'); return } planEditSaving.value = true; mutationError.value = null; try { await updateInboundPlan(target.orderNo, { customerId: target.customerId, overseasWarehouseId: planEditForm.warehouseId, warehouseCode: planEditForm.warehouseCode, warehouseName: planEditForm.warehouseName, version: planEditForm.version }); planEditOpen.value = false; ElMessage.success('入库单已更新'); await load() } catch (error) { mutationError.value = getApiErrorDetails(error, '入库单更新失败，请重试') } finally { planEditSaving.value = false } }
 onMounted(() => { void load() })
 </script>

 <template>
  <AdminPage><OperationErrorToast :details="mutationError" /><ListPageLayout aria-label="海外仓入库单列表">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="入库单筛选" preference-key="overseas-inbound-orders-query" @search="search" @reset="reset" /></template>
+    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="入库单筛选" preference-key="overseas-inbound-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
    <template v-if="loadError" #state><LoadErrorState title="入库单加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
    <section v-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-inbound-orders" row-key="lineId" empty-text="暂无入库单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
      <template #toolbar-actions><el-button v-if="access.can(permission.inboundOrderAppointment)" plain :disabled="!selectedRows.length" @click="openAppointment"><CalendarCheck2 :size="16" />预约</el-button><el-button v-if="access.can(permission.inboundOrderSmartDispatch)" type="primary" @click="openSmartDispatch"><Truck :size="16" />智能排车</el-button></template>
-      <template #actions="{ row }"><el-button size="small" plain type="primary" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-button v-if="access.can(permission.inboundOrderEdit) && ['待入库'].includes((row as InboundOrderListItem).status)" size="small" plain @click="openPlanEdit(row)"><Pencil :size="15" />编辑</el-button><el-button v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderAppointment)" size="small" plain @click="openAppointmentEdit(row)"><Pencil :size="15" />预约</el-button></template>
+      <template #actions="{ row }"><div class="row-actions"><el-button size="small" plain type="primary" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-button v-if="access.can(permission.inboundOrderEdit) && ['待入库'].includes((row as InboundOrderListItem).status)" size="small" plain @click="openPlanEdit(row)"><Pencil :size="15" />编辑</el-button><el-button v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderAppointment)" size="small" plain @click="openAppointmentEdit(row)"><Pencil :size="15" />预约</el-button></div></template>
      <template #pagination-left>共 {{ total }} 条入库单 · 已选 {{ selectedRows.length }} 条</template>
    </DataTable></section>
  </ListPageLayout>
@@ -208,5 +213,8 @@ onMounted(() => { void load() })
 .appointment-summary { margin-bottom: 16px; padding: 10px 12px; border: 1px solid #cdddfd; border-radius: 6px; background: #f5f9ff; color: #52627a; font-size: 13px; }
 .appointment-form { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 18px; }
 .appointment-form :deep(.el-date-editor), .appointment-form :deep(.el-select) { width: 100%; }
+.row-actions { display: inline-flex; min-width: max-content; align-items: center; flex-wrap: nowrap; gap: 8px; white-space: nowrap; }
+.row-actions :deep(.el-button) { flex: 0 0 auto; }
+.row-actions :deep(.el-button + .el-button) { margin-left: 0; }
@media (max-width: 720px) { .appointment-form { grid-template-columns: 1fr; } }
 </style>
@@ -64,7 +64,29 @@ describe('inventory customer-name snapshots', () => {
    await flushPromises()
    expect(wrapper.text()).toContain('华远贸易')
    expect(wrapper.text()).toContain('洛杉矶仓')
+    expect(wrapper.find('.overseas-detail-title p').text()).toBe(`入库单号 / 入仓码 / SKU ${balance.inboundOrderNo} / ${balance.inboundCode} / ${balance.skuCode}`)
+    expect(wrapper.text()).toContain('美本土散板')
+    expect(wrapper.text()).not.toContain('美本土散版')
    expect(wrapper.text()).not.toContain('ONT8目的仓')
    expect(wrapper.text()).not.toContain(customerId)
+    expect(wrapper.text()).not.toContain(balance.id)
+  })
+
+  it('combines the available references and then shows an explicit empty business reference without exposing the inventory id', async () => {
+    vi.mocked(listInventoryBalances).mockResolvedValueOnce({ records: [{ ...balance, inboundOrderNo: '', skuCode: '' }], page: 1, size: 10, total: 1, pages: 1 })
+    routing.route.params = { inventoryId: balance.id }
+    routing.route.query = { inboundCode: balance.inboundCode }
+    const inboundCodeWrapper = mount(InventoryDetailView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
+    await flushPromises()
+    expect(inboundCodeWrapper.find('.overseas-detail-title p').text()).toBe(`入仓码 ${balance.inboundCode}`)
+    expect(inboundCodeWrapper.text()).not.toContain(balance.id)
+
+    inboundCodeWrapper.unmount()
+    vi.mocked(listInventoryBalances).mockResolvedValueOnce({ records: [{ ...balance, inboundOrderNo: '', inboundCode: '', skuCode: '' }], page: 1, size: 10, total: 1, pages: 1 })
+    routing.route.query = {}
+    const emptyWrapper = mount(InventoryDetailView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
+    await flushPromises()
+    expect(emptyWrapper.find('.overseas-detail-title p').text()).toBe('业务标识 —')
+    expect(emptyWrapper.text()).not.toContain(balance.id)
  })
 })
@@ -8,9 +8,16 @@ import { listInventoryBalances, listInventoryLedger, listInventoryPositions, typ
 const route = useRoute(); const router = useRouter(); const inventoryId = computed(() => String(route.params.inventoryId || ''))
 const balance = ref<InventoryBalanceDto | null>(null); const positions = ref<InventoryPositionDto[]>([]); const ledger = ref<InventoryLedgerDto[]>([]); const loading = ref(false); const loadError = ref<ApiErrorDetails | null>(null)
 function text(value: unknown) { return String(value ?? '').trim() || '—' }
+const businessReferences = computed(() => [
+  ['入库单号', balance.value?.inboundOrderNo || route.query.inboundOrderNo],
+  ['入仓码', balance.value?.inboundCode || route.query.inboundCode],
+  ['SKU', balance.value?.skuCode || route.query.skuCode],
+].map(([label, value]) => [String(label), String(value ?? '').trim()] as const).filter(([, value]) => value))
+const referenceLabel = computed(() => businessReferences.value.map(([label]) => label).join(' / ') || '业务标识')
+const referenceValue = computed(() => businessReferences.value.map(([, value]) => value).join(' / ') || '—')
 const productValues = computed(() => ({ 客户: text(balance.value?.customerName), 海外仓: text(balance.value?.overseasWarehouseName), SKU编码: text(balance.value?.skuCode), 产品名称: balance.value ? inventoryProductName(balance.value) : '—', 更新时间: formatOverseasDateTime(balance.value?.updatedAt) }))
-const stockValues = computed(() => ({ 在库总量: Number(balance.value?.totalPackages || 0), 可用库存: Number(balance.value?.availablePackages || 0), 暂扣库存: Number(balance.value?.holdPackages || 0), 美本土散版: '—', 在途库存: Number(balance.value?.inTransitPackages || 0), 采购库存: Number(balance.value?.procurementPackages || 0), 预计总量: Number(balance.value?.totalPackages || 0) + Number(balance.value?.inTransitPackages || 0) + Number(balance.value?.procurementPackages || 0) }))
-const productFields = ['客户', '海外仓', 'SKU编码', '产品名称', '更新时间']; const stockFields = ['在库总量', '可用库存', '暂扣库存', '美本土散版', '在途库存', '采购库存', '预计总量']
+const stockValues = computed(() => ({ 在库总量: Number(balance.value?.totalPackages || 0), 可用库存: Number(balance.value?.availablePackages || 0), 暂扣库存: Number(balance.value?.holdPackages || 0), 美本土散板: '—', 在途库存: Number(balance.value?.inTransitPackages || 0), 采购库存: Number(balance.value?.procurementPackages || 0), 预计总量: Number(balance.value?.totalPackages || 0) + Number(balance.value?.inTransitPackages || 0) + Number(balance.value?.procurementPackages || 0) }))
+const productFields = ['客户', '海外仓', 'SKU编码', '产品名称', '更新时间']; const stockFields = ['在库总量', '可用库存', '暂扣库存', '美本土散板', '在途库存', '采购库存', '预计总量']
 const locationRows = computed(() => positions.value.map((item) => ({ id: String(item.id), location: text(item.warehouseLocationCode), status: text(item.status), palletNo: text(item.palletNo), cartons: Number(item.totalPackages || 0), quantity: Number(item.totalPackages || 0), available: Number(item.availablePackages || 0), inboundDate: formatOverseasDateTime(item.updatedAt), ageDays: '—' })))
 const palletRows = computed(() => positions.value.map((item) => ({ id: String(item.id), palletNo: text(item.palletNo), cartons: Number(item.totalPackages || 0), cartonRange: '—', location: text(item.warehouseLocationCode), quantity: Number(item.totalPackages || 0) })))
 const ledgerRows = computed(() => ledger.value.map((item) => ({ id: String(item.id), occurredAt: formatOverseasDateTime(item.occurredAt), businessType: inventoryBusinessTypeLabel(item.businessType), businessOrderNo: text(item.businessOrderNo), inboundOrderNo: text(item.inboundOrderNo), outboundOrderNo: text(item.outboundOrderNo), location: text(item.warehouseLocationCode), inboundQuantity: item.deltaPackages > 0 ? item.deltaPackages : 0, outboundQuantity: item.deltaPackages < 0 ? Math.abs(item.deltaPackages) : 0, balance: Number(item.afterPackages || 0), operator: '—', remark: text(item.remark) })))
@@ -21,7 +28,7 @@ async function load() { if (!inventoryId.value) { loadError.value = { message: '
 function back() { void router.push({ name: 'overseas-inventory' }) }; onMounted(load)
 </script>

-<template><OverseasDetailShell title="库存详情" reference-label="库存记录" :reference-value="inventoryId" back-label="返回库存管理" domain="库存详情" :pending="false" :status-text="balance ? '库存事实' : '加载中'" @back="back"><LoadErrorState v-if="loadError" title="库存详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
+<template><OverseasDetailShell title="库存详情" :reference-label="referenceLabel" :reference-value="referenceValue" back-label="返回库存管理" domain="库存详情" :pending="false" :status-text="balance ? '库存事实' : '加载中'" @back="back"><LoadErrorState v-if="loadError" title="库存详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
  <template v-else><section v-loading="loading" class="overview-panel" aria-label="库存概览"><section aria-labelledby="inventory-product-heading"><h2 id="inventory-product-heading">商品信息</h2><dl class="detail-fields"><div v-for="label in productFields" :key="label"><dt>{{ label }}</dt><dd>{{ productValues[label as keyof typeof productValues] }}</dd></div></dl></section><section aria-labelledby="inventory-summary-heading"><h2 id="inventory-summary-heading">库存状态汇总</h2><dl class="detail-fields"><div v-for="label in stockFields" :key="label"><dt>{{ label }}</dt><dd>{{ stockValues[label as keyof typeof stockValues] }}</dd></div></dl></section></section>
  <section class="ledger-section" aria-labelledby="inventory-location-heading"><h2 id="inventory-location-heading">库位库存</h2><DataTable :data="locationRows" :columns="locationColumns" column-settings-mode="hide" row-key="id" empty-text="暂无库位库存" /></section><section class="ledger-section" aria-labelledby="inventory-pallet-heading"><h2 id="inventory-pallet-heading">托盘箱号信息</h2><DataTable :data="palletRows" :columns="palletColumns" column-settings-mode="hide" row-key="id" empty-text="暂无托盘库存" /></section><section class="ledger-section" aria-labelledby="inventory-ledger-heading"><h2 id="inventory-ledger-heading">进销存单据明细</h2><p class="ledger-note">按该库存记录的入库单范围展示，出库字段仅为只读事实。</p><DataTable :data="ledgerRows" :columns="ledgerColumns" column-settings-mode="hide" row-key="id" empty-text="暂无进销存明细" /></section></template>
 </OverseasDetailShell></template>
@@ -41,7 +41,7 @@ function search(model: QueryModel) { page.value = 1; void load(model) }; functio
 async function exportLedger() { exportLoading.value = true; try { const range = Array.isArray(filters.value.occurredDate) ? filters.value.occurredDate.map(String) : []; saveCsv(await downloadInventoryLedger({ customerName: String(filters.value.customerName || '').trim() || undefined, destinationWarehouseCode: String(filters.value.warehouse || '').trim() || undefined, skuCode: String(filters.value.sku || '').trim() || undefined, businessType: String(filters.value.businessType || '').trim() || undefined, businessOrderNo: String(filters.value.businessOrderNo || '').trim() || undefined, inboundCode: String(filters.value.inboundCode || '').trim() || undefined, inboundOrderNo: String(filters.value.inboundOrderNo || '').trim() || undefined, outboundOrderNo: String(filters.value.outboundOrderNo || '').trim() || undefined, occurredFrom: range[0] ? `${range[0]}T00:00:00` : undefined, occurredTo: range[1] ? `${range[1]}T23:59:59` : undefined }) as Blob, '进销存记录.csv') } catch { ElMessage.error('进销存导出失败，请重试') } finally { exportLoading.value = false } }
 </script>

-<template><AdminPage><ListPageLayout aria-label="进销存记录列表"><template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="进销存记录筛选" preference-key="overseas-inventory-transactions-query" @search="search" @reset="reset" /></template>
+<template><AdminPage><ListPageLayout aria-label="进销存记录列表"><template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="进销存记录筛选" preference-key="overseas-inventory-transactions-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
  <template v-if="loadError" #state><LoadErrorState title="进销存记录加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
  <template v-else #state><p class="read-only-boundary">本页面仅用于查询库存流水，不提供出库单跳转或库存变更操作。</p></template>
  <section v-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-inventory-transactions" row-key="id" empty-text="暂无进销存记录" @update:page="load()" @update:page-size="page = 1; load()"><template #toolbar-actions><el-button v-if="access.can(permission.inventoryExport)" plain :loading="exportLoading" @click="exportLedger"><Download :size="16" />导出记录</el-button><el-button @click="back"><ArrowLeft :size="16" />返回库存管理</el-button></template><template #actions="{ row }"><el-button link type="primary" :disabled="(row as InventoryTransactionListItem).inboundCode === '—'" @click="openRelationship(row as InventoryTransactionListItem)">关联数据</el-button></template><template #pagination-left>共 {{ total }} 条进销存记录</template></DataTable></section>
@@ -34,10 +34,12 @@ const mutationError = ref<ApiErrorDetails | null>(null)
 const activeTab = ref('basic')
 const feeDialogOpen = ref(false)
 const feeForm = reactive({ item: '', currency: 'USD', amount: 0, status: 'PENDING_REVIEW', description: '' })
+const feeItemOptions = ['仓储费', '入库操作费', '出库操作费', '换标费', '托盘费', '派送费', '转仓费', '异常处理费', '其他']

 function text(value: unknown) { return String(value ?? '').trim() || '—' }
 function yesNo(value: boolean | null | undefined) { return value == null ? '—' : value ? '是' : '否' }
 function feeStatusLabel(value: string) { return ({ PENDING_REVIEW: '待审核', APPROVED: '审核通过', REJECTED: '已驳回' } as Record<string, string>)[value] || value }
+function isSingleLineBusinessField(field: DetailField) { return field.label === '入仓码' || field.label === '集装箱号' }

 const referenceValue = computed(() => lastMileOrderReference(detail.value?.order.orderNo, '订单编码待补充'))
 const orderFields = computed<DetailField[]>(() => {
@@ -158,13 +160,13 @@ onMounted(load)
      <el-tabs v-model="activeTab" class="detail-tabs">
        <el-tab-pane label="基本信息" name="basic">
          <div class="basic-grid">
-            <section class="info-panel"><h2>订单信息</h2><dl class="detail-fields"><div v-for="field in orderFields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value }}</dd></div></dl></section>
-            <section class="info-panel"><h2>货柜信息</h2><dl class="detail-fields"><div v-for="field in containerFields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value }}</dd></div></dl></section>
+            <section class="info-panel"><h2>订单信息</h2><dl class="detail-fields"><div v-for="field in orderFields" :key="field.label"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div></dl></section>
+            <section class="info-panel"><h2>货柜信息</h2><dl class="detail-fields"><div v-for="field in containerFields" :key="field.label"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div></dl></section>
          </div>
        </el-tab-pane>
        <el-tab-pane label="货物信息" name="cargo"><section class="table-panel"><DataTable :data="cargo" :columns="cargoColumns" column-settings-mode="hide" row-key="id" empty-text="暂无货物明细"><template #toolbar-start><h2>货物信息</h2></template></DataTable></section></el-tab-pane>
        <el-tab-pane label="计划信息" name="plan">
-          <section class="info-panel plan-panel"><h2>计划信息</h2><dl class="detail-fields plan-fields"><div v-for="field in planFields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value }}</dd></div></dl></section>
+          <section class="info-panel plan-panel"><h2>计划信息</h2><dl class="detail-fields plan-fields"><div v-for="field in planFields" :key="field.label"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div></dl></section>
          <section class="table-panel related-panel"><DataTable :data="documents" :columns="documentColumns" column-settings-mode="hide" empty-text="暂无关联单据"><template #toolbar-start><h2>关联单据</h2></template></DataTable></section>
        </el-tab-pane>
        <el-tab-pane label="费用明细" name="fees"><section class="table-panel"><DataTable :data="fees" :columns="feeColumns" column-settings-mode="hide" row-key="id" empty-text="暂无费用明细"><template #toolbar-start><h2>费用明细</h2></template><template #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderTransfer)" type="primary" @click="openFeeDialog"><Plus :size="16" />新增费用</el-button></template></DataTable></section></el-tab-pane>
@@ -172,13 +174,13 @@ onMounted(load)
      </el-tabs>
    </section>
    <AppDialog v-model="feeDialogOpen" title="新增费用" width="min(720px, calc(100vw - 28px))" confirm-text="保存费用" :confirm-loading="saving" @confirm="saveFee">
-      <el-form label-position="top"><el-row :gutter="20">
-        <el-col :span="12"><el-form-item label="费用项目" required><el-input v-model="feeForm.item" maxlength="128" placeholder="如 派送费" /></el-form-item></el-col>
-        <el-col :span="12"><el-form-item label="供应商/说明"><el-input v-model="feeForm.description" maxlength="500" placeholder="请输入供应商或费用说明" /></el-form-item></el-col>
-        <el-col :span="12"><el-form-item label="币种" required><el-select v-model="feeForm.currency"><el-option v-for="currency in ['USD', 'CNY', 'EUR', 'GBP', 'CAD', 'MXN']" :key="currency" :label="currency" :value="currency" /></el-select></el-form-item></el-col>
-        <el-col :span="12"><el-form-item label="金额" required><el-input-number v-model="feeForm.amount" :min="0" :precision="2" :step="10" controls-position="right" placeholder="请输入费用金额" /></el-form-item></el-col>
-        <el-col :span="24"><el-form-item label="状态" required><el-select v-model="feeForm.status"><el-option label="待审核" value="PENDING_REVIEW" /><el-option label="审核通过" value="APPROVED" /><el-option label="已驳回" value="REJECTED" /></el-select></el-form-item></el-col>
-      </el-row></el-form>
+      <el-form class="fee-form" label-position="top"><div class="fee-form-grid">
+        <el-form-item label="费用项目" required><el-select v-model="feeForm.item" filterable allow-create clearable default-first-option placeholder="选择或输入费用项目"><el-option v-for="item in feeItemOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
+        <el-form-item label="供应商/说明"><el-input v-model="feeForm.description" maxlength="500" placeholder="请输入供应商或费用说明" /></el-form-item>
+        <el-form-item label="币种" required><el-select v-model="feeForm.currency" placeholder="请选择币种"><el-option v-for="currency in ['USD', 'CNY', 'EUR', 'GBP', 'CAD', 'MXN']" :key="currency" :label="currency" :value="currency" /></el-select></el-form-item>
+        <el-form-item label="金额" required><el-input-number v-model="feeForm.amount" :min="0" :precision="2" :step="10" controls-position="right" placeholder="请输入费用金额" /></el-form-item>
+        <el-form-item class="fee-form-full" label="状态" required><el-select v-model="feeForm.status" placeholder="请选择费用状态"><el-option label="待审核" value="PENDING_REVIEW" /><el-option label="审核通过" value="APPROVED" /><el-option label="已驳回" value="REJECTED" /></el-select></el-form-item>
+      </div></el-form>
    </AppDialog>
  </OverseasDetailShell>
 </template>
@@ -197,11 +199,16 @@ onMounted(load)
 .detail-fields > div { display: grid; min-width: 0; min-height: 58px; grid-template-columns: minmax(100px, 34%) minmax(0, 1fr); align-items: center; border-bottom: 1px solid var(--cc-border); }
 .detail-fields dt { color: var(--cc-muted); font-size: 13px; }
 .detail-fields dd { min-width: 0; margin: 0; color: var(--cc-text); font-weight: 600; overflow-wrap: anywhere; }
+.detail-field-value--business { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .plan-panel { margin-bottom: 20px; }
 .plan-fields { grid-template-columns: repeat(3, minmax(0, 1fr)); }
 .plan-fields > div { grid-template-columns: minmax(90px, 42%) minmax(0, 1fr); }
 .related-panel { margin-top: 20px; }
 .table-panel :deep(.data-table__toolbar) { min-height: 58px; }
+.fee-form { min-width: 0; overflow-x: hidden; }
+.fee-form-grid { display: grid; min-width: 0; grid-template-columns: repeat(2, minmax(0, 1fr)); column-gap: 20px; }
+.fee-form-full { grid-column: 1 / -1; }
+.fee-form :deep(.el-select), .fee-form :deep(.el-input-number) { width: 100%; }
@media (max-width: 1100px) { .basic-grid { grid-template-columns: 1fr; } .plan-fields { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
-@media (max-width: 720px) { .detail-tabs :deep(.el-tabs__header) { padding: 0 10px; } .detail-tabs :deep(.el-tabs__content) { padding: 12px; } .detail-tabs :deep(.el-tabs__item) { padding: 0 12px; } .detail-fields, .plan-fields { grid-template-columns: 1fr; } }
+@media (max-width: 720px) { .detail-tabs :deep(.el-tabs__header) { padding: 0 10px; } .detail-tabs :deep(.el-tabs__content) { padding: 12px; } .detail-tabs :deep(.el-tabs__item) { padding: 0 12px; } .detail-fields, .plan-fields, .fee-form-grid { grid-template-columns: 1fr; } .fee-form-full { grid-column: auto; } }
 </style>
@@ -1,26 +1,37 @@
 import ElementPlus from 'element-plus'
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
 import { createPinia } from 'pinia'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ApiResponseError } from '@/shared/api/http'
 import DataTable from '@/shared/components/DataTable.vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import QueryToolbar from '@/shared/components/QueryToolbar.vue'
 import { listAllPlatformWarehouses } from '@/modules/warehouses'
 import {
+  changeContainerReceivingWarehouse,
+  createManualInboundPlan,
  convertLastMileContainerToInboundPlans,
-  convertLastMileOrderToInboundPlan,
  getContainerPlanProgress,
  listContainerPlanProgress,
  listLastMileOrders,
  transferLastMileOrders,
+  getLastMileOrderManualNodes,
+  updateLastMileOrderHold,
+  updateLastMileOrderManualNodes,
 } from '../api/lastMileOrders'
 import LastMileOrdersView from './LastMileOrdersView.vue'

-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+const canAccess = vi.hoisted(() => vi.fn<(permissionCode: string) => boolean>(() => true))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canAccess }) }))
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
 vi.mock('../api/lastMileOrders', () => ({
  listLastMileOrders: vi.fn(), listContainerPlanProgress: vi.fn(), getContainerPlanProgress: vi.fn(),
-  convertLastMileOrderToInboundPlan: vi.fn(), convertLastMileContainerToInboundPlans: vi.fn(), transferLastMileOrders: vi.fn(),
+  changeContainerReceivingWarehouse: vi.fn(),
+  createManualInboundPlan: vi.fn(), convertLastMileContainerToInboundPlans: vi.fn(), transferLastMileOrders: vi.fn(),
+  getLastMileOrderManualNodes: vi.fn(), updateLastMileOrderHold: vi.fn(), updateLastMileOrderManualNodes: vi.fn(),
  downloadLastMileOrders: vi.fn(),
 }))

@@ -37,6 +48,8 @@ const bookingId = '2092873463568597001'
 const customerId = '2092618717861048321'
 const summary = {
  sourceContainerBookingId: bookingId, containerNo: 'CONT-15', totalOrderCount: 15,
+  overseasWarehouseId: '9007199254740995', overseasWarehouseCode: 'LAX01', overseasWarehouseName: '洛杉矶接柜仓',
+  assignmentVersion: 7, canChangeReceivingWarehouse: true, receivingWarehouseLockReason: null,
  inboundCodeCount: 15, missingInboundCodeCount: 0, planCount: 10, plannedInboundCodeCount: 10,
  pendingPlanCount: 5, plannedArrivalAt: '2026-09-01T08:00:00', allPlansReady: false,
  blockingReason: '存在5票尚未生成有效入库计划',
@@ -52,8 +65,21 @@ const fbaWarehouse = {
  },
  addressSummary: 'CA Ontario',
 }
+const receivingWarehouse = {
+  ...fbaWarehouse,
+  id: '9007199254740996', warehouseCode: 'LAX02', warehouseName: '洛杉矶二号接柜仓', warehouseType: 'OVERSEAS',
+}
+const currentReceivingWarehouse = {
+  ...receivingWarehouse,
+  id: summary.overseasWarehouseId, warehouseCode: summary.overseasWarehouseCode, warehouseName: summary.overseasWarehouseName,
+}
 function selectedRow(overrides: Record<string, unknown> = {}) {
-  return { id: '2092873463568596994', customerId, sourceContainerBookingId: bookingId, orderNo: 'LMO-260827-0001', ...overrides }
+  return {
+    id: '2092873463568596994', customerId, sourceContainerBookingId: bookingId, orderNo: 'LMO-260827-0001',
+    overseasWarehouseId: summary.overseasWarehouseId, overseasWarehouseCode: summary.overseasWarehouseCode,
+    warehouse: summary.overseasWarehouseName, inboundCode: 'IN-LOCKED', version: 3, pallets: 2,
+    ...overrides,
+  }
 }

 enableAutoUnmount(afterEach)
@@ -97,6 +123,7 @@ async function chooseContainer(wrapper: Awaited<ReturnType<typeof mountView>>) {

 describe('LastMileOrdersView pending order and container conversion', () => {
  beforeEach(() => {
+    canAccess.mockReset().mockReturnValue(true)
    vi.stubGlobal('ResizeObserver', ResizeObserverStub)
    vi.stubGlobal('localStorage', memoryStorage())
    vi.mocked(listLastMileOrders).mockReset().mockResolvedValue({ records: [], page: 1, size: 10, total: 0, pages: 0 })
@@ -105,8 +132,12 @@ describe('LastMileOrdersView pending order and container conversion', () => {
      summary,
      orders: [{ orderId: '2092873463568596994', customerId, orderNo: 'LMO-1', inboundCode: 'IN-1', orderStatus: 'INBOUND_PLANNED', planId: '2092873463568597010', planNo: 'LIP-1', planStatus: 'PENDING_RECEIVING', planValid: true, plannedArrivalAt: '2026-09-01T08:00:00' }],
    })
-    vi.mocked(convertLastMileOrderToInboundPlan).mockReset().mockResolvedValue({})
+    vi.mocked(createManualInboundPlan).mockReset().mockResolvedValue({} as never)
+    vi.mocked(getLastMileOrderManualNodes).mockReset().mockResolvedValue({ orderId: '2092873463568596994', manualOverrideEnabled: false, nodes: [], version: 0 })
+    vi.mocked(updateLastMileOrderHold).mockReset().mockResolvedValue({ orderId: '2092873463568596994', held: true, chargeable: true, version: 1 })
+    vi.mocked(updateLastMileOrderManualNodes).mockReset().mockResolvedValue({ orderId: '2092873463568596994', manualOverrideEnabled: true, nodes: [], version: 1 })
    vi.mocked(convertLastMileContainerToInboundPlans).mockReset().mockResolvedValue([{ planNo: 'LIP-1' }, { planNo: 'LIP-2' }] as never)
+    vi.mocked(changeContainerReceivingWarehouse).mockReset().mockResolvedValue({ ...summary, overseasWarehouseId: '9007199254740996', overseasWarehouseCode: 'LAX02', overseasWarehouseName: '洛杉矶二号接柜仓', assignmentVersion: 8 })
    vi.mocked(listAllPlatformWarehouses).mockReset().mockResolvedValue([fbaWarehouse] as never)
    vi.mocked(transferLastMileOrders).mockReset().mockResolvedValue(2)
  })
@@ -124,17 +155,98 @@ describe('LastMileOrdersView pending order and container conversion', () => {
    expect(listContainerPlanProgress).not.toHaveBeenCalled()
  })

-  it('keeps single-order conversion isolated with long order and customer ids', async () => {
+  it('forwards complete searches and switches every status tab without stale filter failures', async () => {
+    const wrapper = await mountView()
+    const toolbar = wrapper.findComponent(QueryToolbar)
+    const model = {
+      orderNo: 'LMO-SEARCH', inboundCode: 'IN-SEARCH', lxCode: 'LX-SEARCH', orderType: 'FIRST_LEG',
+      warehouse: 'LAX', sourceOrderNo: 'SOURCE-SEARCH', containerNo: 'CONT-SEARCH', transferWarehouseCode: 'ONT8',
+      status: 'DELIVERED', abnormal: 'true', detained: 'false', createdAt: ['2026-09-01', '2026-09-07'],
+    }
+    toolbar.vm.$emit('search', model)
+    await flushPromises()
+    expect(listLastMileOrders).toHaveBeenLastCalledWith({
+      page: 1, size: 10, orderNo: 'LMO-SEARCH', inboundCode: 'IN-SEARCH', lxCode: 'LX-SEARCH', orderType: 'FIRST_LEG',
+      warehouse: 'LAX', sourceOrderNo: 'SOURCE-SEARCH', containerNo: 'CONT-SEARCH', transferWarehouseCode: 'ONT8',
+      currentStatus: 'DELIVERED', abnormal: true, detained: false,
+      createdFrom: '2026-09-01T00:00:00', createdTo: '2026-09-07T23:59:59',
+    })
+    const availableFields = toolbar.props('availableFields') as Array<{ key: string; label: string; placeholder?: string }>
+    expect(availableFields.find((field) => field.key === 'lxCode')).toMatchObject({
+      label: 'LX代码', placeholder: '请输入LX代码',
+    })
+    expect(availableFields.map((field) => field.key)).not.toEqual(expect.arrayContaining(['planNo', 'inboundOrderNo']))
+
+    await wrapper.findAll('.el-radio-button').find((item) => item.text() === '待分配')!.trigger('click')
+    await flushPromises()
+    expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ currentStatus: 'PENDING_ASSIGNMENT', lxCode: 'LX-SEARCH' }))
+
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    expect(listContainerPlanProgress).toHaveBeenLastCalledWith({
+      page: 1, size: 10, containerNo: 'CONT-SEARCH',
+      createdFrom: '2026-09-01T00:00:00', createdTo: '2026-09-07T23:59:59',
+    })
+
+    await wrapper.findAll('.el-radio-button').find((item) => item.text() === '全部')!.trigger('click')
+    await flushPromises()
+    expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ currentStatus: 'DELIVERED', lxCode: 'LX-SEARCH' }))
+
+    const callsBeforeReset = vi.mocked(listLastMileOrders).mock.calls.length
+    ;(toolbar.vm as unknown as { reset(): void }).reset()
+    await flushPromises()
+    expect(vi.mocked(listLastMileOrders).mock.calls).toHaveLength(callsBeforeReset + 1)
+    expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1 }))
+    expect(vi.mocked(listLastMileOrders).mock.calls.at(-1)?.[0].lxCode).toBeUndefined()
+    expect(wrapper.text()).not.toContain('尾程订单加载失败')
+  })
+
+  it('opens the required single-order inbound-plan form without invoking the cabinet conversion', async () => {
    const wrapper = await openPending()
    await selectRows(wrapper, [selectedRow()])
    await button(wrapper, '生成入库计划')!.trigger('click')
    await flushPromises()
-    expect(convertLastMileOrderToInboundPlan).toHaveBeenCalledTimes(1)
-    expect(convertLastMileOrderToInboundPlan).toHaveBeenCalledWith({ orderId: '2092873463568596994', customerId })
+    expect(document.body.textContent).toContain('计划入库仓')
+    expect(document.body.textContent).toContain('预计到仓日期')
+    expect(document.body.textContent).toContain('托盘类型')
+    const inboundCodeInput = wrapper.findAllComponents({ name: 'ElInput' })
+      .find((input) => input.props('placeholder') === '订单冻结入仓码')
+    expect(inboundCodeInput?.props('disabled')).toBe(true)
+    const receivingWarehouseInput = wrapper.findAllComponents({ name: 'ElInput' })
+      .find((input) => input.props('placeholder') === '当前柜接柜仓')
+    expect(receivingWarehouseInput?.props('disabled')).toBe(true)
+    expect(receivingWarehouseInput?.props('modelValue')).toBe('LAX01 · 洛杉矶接柜仓')
+    expect(document.body.textContent).toContain('接柜仓按柜统一')
+    expect(listAllPlatformWarehouses).not.toHaveBeenCalled()
+    expect(createManualInboundPlan).not.toHaveBeenCalled()
    expect(convertLastMileContainerToInboundPlans).not.toHaveBeenCalled()
    expect(listContainerPlanProgress).not.toHaveBeenCalled()
  })

+  it('shows the order-frozen inbound code but never sends it or a per-order receiving warehouse override', async () => {
+    const wrapper = await openPending()
+    await selectRows(wrapper, [selectedRow()])
+    await button(wrapper, '生成入库计划')!.trigger('click')
+    await flushPromises()
+    const datePicker = wrapper.find('.command-form').findComponent({ name: 'ElDatePicker' })
+    datePicker.vm.$emit('update:modelValue', '2026-09-08')
+    await wrapper.vm.$nextTick()
+    const confirm = [...document.body.querySelectorAll('button')]
+      .find((item) => item.textContent?.includes('保存并生成入库单')) as HTMLButtonElement
+    confirm.click()
+    await flushPromises()
+
+    expect(createManualInboundPlan).toHaveBeenCalledWith(expect.objectContaining({
+      customerId, orderId: '2092873463568596994', expectedOrderVersion: 3,
+      plannedArrivalDate: '2026-09-08', palletCount: 2,
+    }), expect.stringContaining('manual-inbound-plan-'))
+    const payload = vi.mocked(createManualInboundPlan).mock.calls[0][0] as unknown as Record<string, unknown>
+    expect(payload).not.toHaveProperty('inboundCode')
+    expect(payload).not.toHaveProperty('plannedWarehouseId')
+    expect(payload).not.toHaveProperty('plannedWarehouseCode')
+    expect(payload).not.toHaveProperty('plannedWarehouseName')
+  })
+
  it('opens a cabinet selector without requiring order selection and loads server summaries only then', async () => {
    const wrapper = await openPending()
    await openContainerDialog(wrapper)
@@ -155,7 +267,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
    await flushPromises()
    expect(convertLastMileContainerToInboundPlans).toHaveBeenCalledTimes(1)
    expect(convertLastMileContainerToInboundPlans).toHaveBeenCalledWith({ sourceContainerBookingId: bookingId })
-    expect(convertLastMileOrderToInboundPlan).not.toHaveBeenCalled()
+    expect(createManualInboundPlan).not.toHaveBeenCalled()
    expect(document.body.textContent).toContain('已按柜生成 2 个独立入库计划')
    expect(listLastMileOrders).toHaveBeenCalledTimes(3)
  })
@@ -176,29 +288,55 @@ describe('LastMileOrdersView pending order and container conversion', () => {
    expect(wrapper.text()).toContain(`trace-${code}`)
  })

-  it('renders pending cabinets as an arrival-ordered workbench with the remaining inbound-code count', async () => {
+  it('renders all cabinets as an arrival-ordered workbench with the remaining inbound-code count', async () => {
    const nullArrival = { ...summary, sourceContainerBookingId: '2092873463568597002', containerNo: 'CONT-NULL', plannedArrivalAt: null, planCount: 0, pendingPlanCount: 15 }
-    const completed = { ...summary, sourceContainerBookingId: '2092873463568597003', containerNo: 'CONT-DONE', plannedInboundCodeCount: 15, pendingPlanCount: 0, allPlansReady: true }
-    vi.mocked(listContainerPlanProgress).mockResolvedValueOnce({ records: [completed, summary, nullArrival], page: 1, size: 10, total: 3, pages: 1 })
+    vi.mocked(listContainerPlanProgress).mockResolvedValueOnce({ records: [summary, nullArrival], page: 1, size: 10, total: 2, pages: 1 })
    const wrapper = await mountView()
    const containerTab = wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))
    await containerTab!.trigger('click')
    await flushPromises()
    expect(listContainerPlanProgress).toHaveBeenLastCalledWith({ page: 1, size: 10, containerNo: undefined, createdFrom: undefined, createdTo: undefined })
    expect(wrapper.text()).toContain('柜子工作台（2）')
-    expect(wrapper.text()).toContain('待处理柜工作台')
-    expect(wrapper.text()).toContain('按计划到仓时间由近到远排列')
+    expect(wrapper.text()).toContain('货柜工作台')
+    expect(wrapper.text()).toContain('按柜查看和修改海外接柜仓，并为剩余入仓码生成独立入库计划')
    expect(wrapper.text()).toContain('5个入仓码待生成计划')
    expect(wrapper.text()).toContain('共 15 个入仓码')
    expect(wrapper.text()).not.toContain('待补入仓码')
    expect(wrapper.text()).not.toContain('缺入仓码')
    expect(wrapper.text()).not.toContain('已生成 10 个计划')
    expect(wrapper.text()).not.toContain('存在5票尚未生成有效入库计划')
-    expect(wrapper.text()).not.toContain('CONT-DONE')
-    expect(wrapper.text()).toContain('2 个柜待处理')
+    expect(wrapper.text()).toContain('2 个货柜')
    expect(wrapper.text().indexOf('CONT-15')).toBeLessThan(wrapper.text().indexOf('CONT-NULL'))
  })

+  it('keeps an all-plans-ready cabinet visible and allows only the server-authorized warehouse change', async () => {
+    const ready = {
+      ...summary,
+      planCount: summary.inboundCodeCount,
+      plannedInboundCodeCount: summary.inboundCodeCount,
+      pendingPlanCount: 0,
+      allPlansReady: true,
+      blockingReason: null,
+    }
+    vi.mocked(listContainerPlanProgress).mockResolvedValueOnce({ records: [ready], page: 1, size: 10, total: 1, pages: 1 })
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    expect(wrapper.text()).toContain('CONT-15')
+    expect(wrapper.text()).toContain('0个入仓码待生成计划')
+    expect((button(wrapper, '生成入库计划')!.element as HTMLButtonElement).disabled).toBe(true)
+    expect((button(wrapper, '修改接柜仓')!.element as HTMLButtonElement).disabled).toBe(false)
+  })
+
+  it('renders the all-cabinet empty state and unit', async () => {
+    vi.mocked(listContainerPlanProgress).mockResolvedValueOnce({ records: [], page: 1, size: 10, total: 0, pages: 0 })
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    expect(wrapper.text()).toContain('暂无货柜数据')
+    expect(wrapper.text()).not.toContain('已全部生成计划的柜不再展示')
+  })
+
  it('uses independent cabinet pagination and opens the complete long-id detail in a dialog', async () => {
    vi.mocked(listContainerPlanProgress).mockResolvedValue({ records: [summary], page: 1, size: 10, total: 21, pages: 3 })
    const wrapper = await mountView()
@@ -216,6 +354,10 @@ describe('LastMileOrdersView pending order and container conversion', () => {
    expect(document.body.textContent).toContain('LMO-1')
    expect(document.body.textContent).toContain('IN-1')
    expect(document.body.textContent).toContain('LIP-1')
+    expect(document.body.textContent).toContain('已生成入库计划')
+    expect(document.body.textContent).toContain('待收货')
+    expect(document.body.textContent).not.toContain('INBOUND_PLANNED')
+    expect(document.body.textContent).not.toContain('PENDING_RECEIVING')
    expect(document.body.querySelector('.el-dialog')).not.toBeNull()
    expect(document.body.querySelector('.el-drawer')).toBeNull()
  })
@@ -236,6 +378,167 @@ describe('LastMileOrdersView pending order and container conversion', () => {
    expect(getContainerPlanProgress).not.toHaveBeenCalled()
  })

+  it('keeps an invalid historical cabinet readable while blocking plan generation', async () => {
+    const invalid = {
+      ...summary,
+      overseasWarehouseId: null,
+      overseasWarehouseCode: null,
+      overseasWarehouseName: null,
+      blockingReason: '柜内接柜仓业务快照不一致',
+    }
+    vi.mocked(listContainerPlanProgress).mockResolvedValueOnce({ records: [invalid], page: 1, size: 10, total: 1, pages: 1 } as never)
+    vi.mocked(getContainerPlanProgress).mockResolvedValueOnce({ summary: invalid, orders: [] } as never)
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('柜内接柜仓业务快照不一致')
+    expect((button(wrapper, '生成入库计划')!.element as HTMLButtonElement).disabled).toBe(true)
+    await wrapper.get('.container-workbench-card__detail').trigger('click')
+    await flushPromises()
+    expect(getContainerPlanProgress).toHaveBeenCalledWith(bookingId)
+    expect(document.body.textContent).toContain('柜子详情 · CONT-15')
+    expect(convertLastMileContainerToInboundPlans).not.toHaveBeenCalled()
+  })
+
+  it('shows the receiving warehouse and changes it from ACTIVE OVERSEAS master data with versioning', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValueOnce([currentReceivingWarehouse, receivingWarehouse] as never)
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    expect(wrapper.text()).toContain('海外接柜仓')
+    expect(wrapper.text()).toContain('LAX01 · 洛杉矶接柜仓')
+    expect(wrapper.get('.container-workbench-card__warehouse strong').attributes('title')).toBe('LAX01 · 洛杉矶接柜仓')
+    expect(listAllPlatformWarehouses).not.toHaveBeenCalled()
+    await button(wrapper, '修改接柜仓')!.trigger('click')
+    await flushPromises()
+    const receivingDialog = wrapper.findAllComponents(AppDialog).find((item) => item.props('title') === '修改海外接柜仓')!
+    expect(receivingDialog.props('width')).toBe('min(600px, calc(100vw - 28px))')
+    expect(listAllPlatformWarehouses).toHaveBeenLastCalledWith({ warehouseType: 'OVERSEAS', status: 'ACTIVE' })
+    expect(listAllPlatformWarehouses).toHaveBeenCalledTimes(1)
+    const warehouseSelect = wrapper.findAllComponents({ name: 'ElSelect' }).find((item) => item.props('placeholder') === '请选择 ACTIVE 海外接柜仓')!
+    expect(warehouseSelect.props('modelValue')).toBe('')
+    expect(wrapper.text()).not.toContain('9007199254740995')
+    const warehouseOptions = wrapper.findAllComponents({ name: 'ElOption' })
+    expect(warehouseOptions.find((item) => item.props('value') === summary.overseasWarehouseId)?.props('disabled')).toBe(true)
+    const confirm = [...document.body.querySelectorAll('button')].find((item) => item.textContent?.includes('确认修改')) as HTMLButtonElement
+    warehouseSelect.vm.$emit('update:modelValue', summary.overseasWarehouseId)
+    await wrapper.vm.$nextTick()
+    expect(confirm.disabled).toBe(true)
+    expect(wrapper.text()).toContain('新的海外接柜仓必须与当前仓不同')
+    warehouseSelect.vm.$emit('update:modelValue', '9007199254740996')
+    await wrapper.vm.$nextTick()
+    expect(confirm.disabled).toBe(false)
+    confirm.click()
+    await flushPromises()
+    expect(changeContainerReceivingWarehouse).toHaveBeenCalledWith(bookingId, {
+      overseasWarehouseId: '9007199254740996', expectedVersion: 7, remark: undefined,
+    }, expect.stringMatching(/^container-receiving-warehouse-/))
+    expect(listContainerPlanProgress).toHaveBeenCalledTimes(2)
+  })
+
+  it('keeps the receiving-warehouse confirmation disabled while candidates are loading', async () => {
+    let resolveCandidates!: (value: typeof receivingWarehouse[]) => void
+    vi.mocked(listAllPlatformWarehouses).mockReturnValueOnce(new Promise((resolve) => { resolveCandidates = resolve }) as never)
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    await button(wrapper, '修改接柜仓')!.trigger('click')
+    await wrapper.vm.$nextTick()
+    const confirm = [...document.body.querySelectorAll('button')].find((item) => item.textContent?.includes('确认修改')) as HTMLButtonElement
+    expect(confirm.disabled).toBe(true)
+    expect(listAllPlatformWarehouses).toHaveBeenCalledTimes(1)
+    resolveCandidates([receivingWarehouse])
+    await flushPromises()
+    expect(confirm.disabled).toBe(true)
+  })
+
+  it('keeps a disabled receiving-warehouse action discoverable when the server locks the container', async () => {
+    vi.mocked(listContainerPlanProgress).mockResolvedValueOnce({
+      records: [{ ...summary, canChangeReceivingWarehouse: false, receivingWarehouseLockReason: '海外仓已开始拆柜收货' }],
+      page: 1, size: 10, total: 1, pages: 1,
+    })
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    expect(wrapper.text()).toContain('海外仓已开始拆柜收货')
+    const changeButton = button(wrapper, '修改接柜仓')!
+    expect(changeButton.exists()).toBe(true)
+    expect((changeButton.element as HTMLButtonElement).disabled).toBe(true)
+    expect(changeButton.attributes('title')).toBe('海外仓已开始拆柜收货')
+    expect(changeContainerReceivingWarehouse).not.toHaveBeenCalled()
+  })
+
+  it('keeps a disabled receiving-warehouse action discoverable without edit permission', async () => {
+    canAccess.mockImplementation((permissionCode: string) => permissionCode !== 'platform:overseas-warehouse:last-mile-order:edit')
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    const changeButton = button(wrapper, '修改接柜仓')!
+    expect(changeButton.exists()).toBe(true)
+    expect((changeButton.element as HTMLButtonElement).disabled).toBe(true)
+    expect(changeButton.attributes('title')).toBe('暂无修改接柜仓权限，请联系管理员开通尾程订单编辑权限')
+    await changeButton.trigger('click')
+    expect(listAllPlatformWarehouses).not.toHaveBeenCalled()
+    expect(changeContainerReceivingWarehouse).not.toHaveBeenCalled()
+  })
+
+  it('keeps conflict metadata visible and refreshes the stale container summary', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValueOnce([receivingWarehouse] as never)
+    vi.mocked(changeContainerReceivingWarehouse).mockRejectedValueOnce(new ApiResponseError(
+      'version conflict', 'A0409', 200, undefined, 'request-receiving', 'trace-receiving',
+    ))
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    await button(wrapper, '修改接柜仓')!.trigger('click')
+    await flushPromises()
+    const warehouseSelect = wrapper.findAllComponents({ name: 'ElSelect' }).find((item) => item.props('placeholder') === '请选择 ACTIVE 海外接柜仓')!
+    warehouseSelect.vm.$emit('update:modelValue', '9007199254740996')
+    await wrapper.vm.$nextTick()
+    const confirm = [...document.body.querySelectorAll('button')].find((item) => item.textContent?.includes('确认修改')) as HTMLButtonElement
+    confirm.click()
+    await flushPromises()
+    expect(wrapper.text()).toContain('接柜仓信息已被其他操作更新，请刷新后重试')
+    expect(wrapper.text()).toContain('request-receiving')
+    expect(wrapper.text()).toContain('trace-receiving')
+    expect(listContainerPlanProgress).toHaveBeenCalledTimes(2)
+  })
+
+  it('renders an explicit empty state when there are no ACTIVE OVERSEAS receiving warehouses', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValueOnce([])
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    await button(wrapper, '修改接柜仓')!.trigger('click')
+    await flushPromises()
+    expect(document.body.textContent).toContain('暂无可用的 ACTIVE 海外接柜仓')
+    expect(changeContainerReceivingWarehouse).not.toHaveBeenCalled()
+  })
+
+  it('keeps receiving-warehouse candidate failure metadata visible without an FBA fallback', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockRejectedValueOnce(new ApiResponseError(
+      'receiving warehouse candidate failed', 'A0503', 200, undefined, 'request-receiving-options', 'trace-receiving-options',
+    ))
+    const wrapper = await mountView()
+    await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click')
+    await flushPromises()
+    await button(wrapper, '修改接柜仓')!.trigger('click')
+    await flushPromises()
+    expect(document.body.textContent).toContain('request-receiving-options')
+    expect(document.body.textContent).toContain('trace-receiving-options')
+    expect(document.body.textContent).not.toContain('请选择目的 FBA 仓')
+    expect(changeContainerReceivingWarehouse).not.toHaveBeenCalled()
+  })
+
+  it('keeps dense cabinet fields and actions on one line with ellipsis at 1920px', () => {
+    const source = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/pages/LastMileOrdersView.vue'), 'utf8')
+    expect(source).toContain('.container-detail-summary > span { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }')
+    expect(source).toContain('.container-workbench-card__warehouse strong { min-width: 0; overflow: hidden; color: var(--cc-text); font-size: 14px; text-overflow: ellipsis; white-space: nowrap; }')
+    expect(source).toContain('.container-workbench-card__actions { display: flex; justify-content: flex-end; gap: 8px; padding-top: 2px; white-space: nowrap; }')
+    expect(source).toContain("{ key: 'actions', label: '操作', width: 178, fixed: 'left'")
+  })
+
  it('loads only active FBA master data and submits exact string fields for a cross-customer transfer', async () => {
    const wrapper = await openPending()
    await selectRows(wrapper, [selectedRow(), selectedRow({ id: '2092873463568596995', customerId: '2092618717861048322' })])
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref } from 'vue'
-import { Download, Eye } from '@lucide/vue'
+import { Download, Eye, Pencil } from '@lucide/vue'
 import { ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
 import { listAllPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
@@ -13,11 +13,11 @@ import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
-import { convertLastMileContainerToInboundPlans, convertLastMileOrderToInboundPlan, downloadLastMileOrders, getContainerPlanProgress, listContainerPlanProgress, listLastMileOrders, transferLastMileOrders, type ContainerPlanProgressDetailDto, type ContainerPlanProgressSummaryDto } from '../api/lastMileOrders'
+import { changeContainerReceivingWarehouse, convertLastMileContainerToInboundPlans, createManualInboundPlan, downloadLastMileOrders, getContainerPlanProgress, getLastMileOrderManualNodes, listContainerPlanProgress, listLastMileOrders, transferLastMileOrders, updateLastMileOrderHold, updateLastMileOrderManualNodes, type ContainerPlanProgressDetailDto, type ContainerPlanProgressSummaryDto, type ManualNodeCode } from '../api/lastMileOrders'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { overseasWarehousePermissions as permission } from '../permissions'
-import { toLastMileOrderListItem } from '../lastMilePresentation'
+import { lastMileStatusLabel, toLastMileOrderListItem } from '../lastMilePresentation'
 import type { LastMileOrderListItem } from '../types'
 import { saveCsv } from '@/shared/downloadCsv'

@@ -40,6 +40,28 @@ const actionLoading = ref(false)
 const exportLoading = ref(false)
 async function exportOrders() { exportLoading.value = true; try { const { createdAt: range, ...rest } = filters.value; saveCsv(await downloadLastMileOrders({ ...rest, createdFrom: Array.isArray(range) && range[0] ? `${String(range[0]).slice(0, 10)}T00:00:00` : undefined, createdTo: Array.isArray(range) && range[1] ? `${String(range[1]).slice(0, 10)}T23:59:59` : undefined }) as Blob, '尾程订单.csv') } catch (cause) { ElMessage.error(getApiErrorDetails(cause, '尾程订单导出失败，请重试').message) } finally { exportLoading.value = false } }
 const actionError = ref<ApiErrorDetails | null>(null)
+const actionTarget = ref<LastMileOrderListItem | null>(null)
+const inboundPlanOpen = ref(false)
+const inboundPlanWarehouseLabel = computed(() => [actionTarget.value?.overseasWarehouseCode, actionTarget.value?.warehouse]
+  .filter((value) => value && value !== '—')
+  .join(' · '))
+const inboundPlanForm = reactive({ plannedArrivalDate: '', inboundCode: '', palletCount: 1, palletType: 'STANDARD' as 'STANDARD' | 'WOOD' | 'PAPER', assigned: false, mergeRequired: false, urgent: false, remark: '' })
+const holdOpen = ref(false)
+const holdForm = reactive({ held: true, chargeable: true, reason: '' })
+const manualNodesOpen = ref(false)
+const manualNodesLoading = ref(false)
+const manualNodesVersion = ref(0)
+const manualNodeDefinitions: Array<{ code: ManualNodeCode; label: string }> = [
+  { code: 'DOMESTIC_CUSTOMS_COMPLETED', label: '国内报关完成' },
+  { code: 'ESTIMATED_DEPARTURE', label: '预计开船' },
+  { code: 'ACTUAL_DEPARTURE', label: '实际开船' },
+  { code: 'ESTIMATED_ARRIVAL', label: '预计到港' },
+  { code: 'OVERSEAS_CUSTOMS_COMPLETED', label: '国外清关完成' },
+  { code: 'ACTUAL_ARRIVAL_WAITING_UNLOAD', label: '实际到港等待卸船' },
+  { code: 'PICKUP_APPOINTED', label: '预约提柜' },
+  { code: 'UNLOADED', label: '卸柜' },
+]
+const manualNodeValues = reactive<Record<ManualNodeCode, string | null>>(Object.fromEntries(manualNodeDefinitions.map(({ code }) => [code, null])) as Record<ManualNodeCode, string | null>)
 const transferOpen = ref(false)
 const transferWarehouseLoading = ref(false)
 const transferWarehouseError = ref<ApiErrorDetails | null>(null)
@@ -50,13 +72,21 @@ const containerOptions = ref<ContainerPlanProgressSummaryDto[]>([])
 const containerOptionsLoading = ref(false)
 const containerLoadError = ref<ApiErrorDetails | null>(null)
 const selectedContainerBookingId = ref('')
+const receivingWarehouseOpen = ref(false)
+const receivingWarehouseLoading = ref(false)
+const receivingWarehouseError = ref<ApiErrorDetails | null>(null)
+const receivingWarehouseActionError = ref<ApiErrorDetails | null>(null)
+const receivingWarehouseOptions = ref<TransferWarehouseOption[]>([])
+const receivingWarehouseTarget = ref<ContainerPlanProgressSummaryDto | null>(null)
+const receivingWarehouseForm = reactive({ warehouseId: '', remark: '' })
+let receivingWarehouseIdempotencyKey = ''
 let containerOptionRequest = 0
 const statusTab = ref<'全部' | '待分配' | '柜子'>('全部')
 const filters = ref<QueryModel>({ orderNo: '', orderType: '', warehouse: '', inboundCode: '', lxCode: '', sourceOrderNo: '', containerNo: '', status: '', transferWarehouseCode: '', abnormal: '', detained: '', createdAt: [] })
 const allFields: QueryField[] = [
  { key: 'orderNo', type: 'input', label: '尾程单号', width: 190, placeholder: '请输入尾程单号' },
  { key: 'inboundCode', type: 'input', label: '入仓码', width: 180, placeholder: '请输入入仓码' },
-  { key: 'lxCode', type: 'input', label: 'LX代码', width: 180, placeholder: '请输入领星入库单代码' },
+  { key: 'lxCode', type: 'input', label: 'LX代码', width: 180, placeholder: '请输入LX代码' },
  { key: 'orderType', type: 'select', label: '订单类型', width: 170, placeholder: '全部类型', options: [
    { label: '头程订单', value: 'FIRST_LEG' }, { label: '换标下单', value: 'RELABEL_APPLICATION' },
    { label: '仓储转运', value: 'WAREHOUSE_TRANSFER' }, { label: '本土散板', value: 'LOCAL_LOOSEBOARD' },
@@ -82,6 +112,10 @@ const fields = computed<QueryField[]>(() => statusTab.value === '柜子'
  ? allFields.filter((field) => ['containerNo', 'createdAt'].includes(field.key))
  : allFields)
 const selectedContainer = computed(() => containerOptions.value.find((row) => row.sourceContainerBookingId === selectedContainerBookingId.value))
+const selectedReceivingWarehouse = computed(() => receivingWarehouseOptions.value.find((row) => (
+  row.warehouseId === receivingWarehouseForm.warehouseId
+  && row.warehouseId !== receivingWarehouseTarget.value?.overseasWarehouseId
+)))

 interface TransferWarehouseOption {
  warehouseId: string
@@ -112,8 +146,25 @@ function toTransferWarehouseOption(warehouse: PlatformWarehouseSummaryResource):
    label: [warehouseCode, warehouseName, region].filter(Boolean).join(' · '),
  }
 }
+
+function receivingWarehouseLabel(container: ContainerPlanProgressSummaryDto | null | undefined) {
+  if (!container) return '—'
+  const code = String(container.overseasWarehouseCode || '').trim()
+  const name = String(container.overseasWarehouseName || '').trim()
+  return [code, name].filter(Boolean).join(' · ') || '—'
+}
+
+function receivingWarehouseChangeDisabledReason(container: ContainerPlanProgressSummaryDto) {
+  if (!access.can(permission.lastMileOrderTransfer)) return '暂无修改接柜仓权限，请联系管理员开通尾程订单编辑权限'
+  if (!container.canChangeReceivingWarehouse) return container.receivingWarehouseLockReason || '当前柜已锁定，不能修改接柜仓'
+  return ''
+}
+
+function newReceivingWarehouseIdempotencyKey() {
+  return `container-receiving-warehouse-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`
+}
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 270, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 178, fixed: 'left', slotName: 'actions' },
  { key: 'selection', type: 'selection', width: 48, fixed: 'left' },
  { key: 'orderNo', prop: 'orderNo', label: '尾程单号', minWidth: 170, slotName: 'orderNo' },
  { key: 'consolidated', prop: 'consolidated', label: '合托标记', width: 100, hideable: false },
@@ -152,17 +203,44 @@ const columns: DataTableColumn[] = [
 const containerDetailColumns: DataTableColumn[] = [
  { key: 'orderNo', prop: 'orderNo', label: '尾程单号', minWidth: 170 },
  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 150 },
-  { key: 'orderStatus', prop: 'orderStatus', label: '订单状态', width: 130 },
+  { key: 'orderStatus', prop: 'orderStatus', label: '订单状态', width: 130, slotName: 'orderStatus' },
  { key: 'planNo', prop: 'planNo', label: '独立入库计划', minWidth: 170 },
-  { key: 'planStatus', prop: 'planStatus', label: '计划状态', width: 130 },
+  { key: 'planStatus', prop: 'planStatus', label: '计划状态', width: 130, slotName: 'planStatus' },
  { key: 'plannedArrivalAt', prop: 'plannedArrivalAt', label: '计划到仓时间', minWidth: 170, slotName: 'plannedArrivalAt' },
 ]

 function formatDateTime(value: string | null | undefined) {
  return value ? value.replace('T', ' ').slice(0, 19) : '—'
 }
+function inboundPlanStatusLabel(value: unknown) {
+  const code = String(value ?? '').trim()
+  return ({
+    PENDING_ASSIGNMENT: '待入库',
+    ASSIGNED: '待入库',
+    PDA_PENDING: '待入库',
+    PENDING_RECEIVING: '待收货',
+    PICKING: '拣货中',
+    PARTIAL_INBOUND: '部分入库',
+    COMPLETED: '全部入库',
+    CANCELLED: '已取消',
+  } as Record<string, string>)[code] || (code ? '未知状态' : '—')
+}
 function canGenerateContainerPlans(container: ContainerPlanProgressSummaryDto) {
-  return Boolean(container.containerNo) && container.pendingPlanCount > 0
+  return Boolean(!container.allPlansReady
+    && container.containerNo
+    && container.overseasWarehouseId
+    && container.overseasWarehouseCode
+    && container.overseasWarehouseName
+    && container.assignmentVersion >= 0
+    && container.pendingPlanCount > 0)
+}
+function containerSnapshotBlockReason(container: ContainerPlanProgressSummaryDto) {
+  if (!container.containerNo) return container.blockingReason || '来源柜真实集装箱号缺失、格式无效或存在漂移'
+  if (!container.overseasWarehouseId || !container.overseasWarehouseCode
+    || !container.overseasWarehouseName || container.assignmentVersion < 0) {
+    return '柜内接柜仓业务快照不一致'
+  }
+  return ''
 }
 function pendingInboundCodeCount(container: ContainerPlanProgressSummaryDto) {
  return Math.max(0, container.inboundCodeCount - container.plannedInboundCodeCount)
@@ -190,9 +268,8 @@ async function load(model: QueryModel = filters.value) {
        createdFrom: dateRange[0] ? `${dateRange[0]}T00:00:00` : undefined,
        createdTo: dateRange[1] ? `${dateRange[1]}T23:59:59` : undefined,
      })
-      const pendingRecords = result.records.filter((container) => pendingInboundCodeCount(container) > 0)
-      containerRows.value = pendingRecords
-      containerTotal.value = Math.max(0, result.total - (result.records.length - pendingRecords.length))
+      containerRows.value = result.records
+      containerTotal.value = result.total
    } catch (error) {
      containerRows.value = []
      containerTotal.value = 0
@@ -212,6 +289,7 @@ async function load(model: QueryModel = filters.value) {
      orderType: String(filters.value.orderType || '').trim() || undefined,
      warehouse: String(filters.value.warehouse || '').trim() || undefined,
      inboundCode: String(filters.value.inboundCode || '').trim() || undefined,
+      lxCode: String(filters.value.lxCode || '').trim() || undefined,
      sourceOrderNo: String(filters.value.sourceOrderNo || '').trim() || undefined,
      containerNo: String(filters.value.containerNo || '').trim() || undefined,
      currentStatus: statusTab.value === '待分配' ? 'PENDING_ASSIGNMENT' : String(filters.value.status || '').trim() || undefined,
@@ -255,6 +333,70 @@ async function openContainerDetail(row: ContainerPlanProgressSummaryDto) {
    containerDetailLoading.value = false
  }
 }
+async function loadReceivingWarehouseOptions() {
+  receivingWarehouseLoading.value = true
+  receivingWarehouseError.value = null
+  receivingWarehouseOptions.value = []
+  try {
+    const warehouses = await listAllPlatformWarehouses({ warehouseType: 'OVERSEAS', status: 'ACTIVE' })
+    receivingWarehouseOptions.value = warehouses.map(toTransferWarehouseOption)
+  } catch (error) {
+    receivingWarehouseError.value = getApiErrorDetails(error, '海外接柜仓候选加载失败，请重试')
+  } finally {
+    receivingWarehouseLoading.value = false
+  }
+}
+function openReceivingWarehouseChange(container: ContainerPlanProgressSummaryDto) {
+  const disabledReason = receivingWarehouseChangeDisabledReason(container)
+  if (disabledReason) {
+    ElMessage.warning(disabledReason)
+    return
+  }
+  receivingWarehouseTarget.value = container
+  Object.assign(receivingWarehouseForm, { warehouseId: '', remark: '' })
+  receivingWarehouseIdempotencyKey = newReceivingWarehouseIdempotencyKey()
+  receivingWarehouseOptions.value = []
+  receivingWarehouseError.value = null
+  receivingWarehouseActionError.value = null
+  actionError.value = null
+  receivingWarehouseOpen.value = true
+  void loadReceivingWarehouseOptions()
+}
+async function submitReceivingWarehouseChange() {
+  const target = receivingWarehouseTarget.value
+  const selected = selectedReceivingWarehouse.value
+  if (!target || !selected) {
+    ElMessage.warning('请选择与当前仓不同的有效海外接柜仓')
+    return
+  }
+  actionLoading.value = true
+  actionError.value = null
+  receivingWarehouseActionError.value = null
+  try {
+    await changeContainerReceivingWarehouse(target.sourceContainerBookingId, {
+      overseasWarehouseId: selected.warehouseId,
+      expectedVersion: target.assignmentVersion,
+      remark: receivingWarehouseForm.remark.trim() || undefined,
+    }, receivingWarehouseIdempotencyKey)
+    receivingWarehouseOpen.value = false
+    receivingWarehouseTarget.value = null
+    ElMessage.success('海外接柜仓修改成功')
+    await load()
+  } catch (error) {
+    const details = getApiErrorDetails(error, '海外接柜仓修改失败，请重试')
+    receivingWarehouseActionError.value = details.code === 'A0409'
+      ? { ...details, message: '接柜仓信息已被其他操作更新，请刷新后重试' }
+      : details
+    actionError.value = receivingWarehouseActionError.value
+    if (details.code === 'A0409') {
+      receivingWarehouseOpen.value = false
+      receivingWarehouseTarget.value = null
+      await load()
+    }
+  } finally {
+    actionLoading.value = false
+  }
+}
 function onSelectionChange(selection: object[]) { selectedRows.value = selection as LastMileOrderListItem[] }
 async function loadTransferWarehouseOptions() {
  transferWarehouseLoading.value = true
@@ -303,26 +445,79 @@ async function submitTransfer() {
  } catch (error) { actionError.value = getApiErrorDetails(error, '转仓失败，请重试') }
  finally { actionLoading.value = false }
 }
-async function convertInboundPlan() {
-  if (selectedRows.value.length !== 1) { ElMessage.warning('生成入库计划时请选择 1 条尾程订单'); return }
-  const selected = selectedRows.value[0]
-  const customerId = typeof selected.customerId === 'string' ? selected.customerId.trim() : ''
-  if (!customerId) {
-    actionError.value = { message: '所选尾程订单缺少客户标识，无法安全生成入库计划' }
+function idempotencyKey(prefix: string) {
+  return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`
+}
+function openInboundPlan(source?: object) {
+  const target = source ? source as LastMileOrderListItem : (selectedRows.value.length === 1 ? selectedRows.value[0] : null)
+  if (!target) { ElMessage.warning('生成入库计划时请选择 1 条尾程订单'); return }
+  if (target.detained) { ElMessage.warning('订单处于暂扣状态，解除暂扣后才能生成入库计划'); return }
+  actionTarget.value = target
+  Object.assign(inboundPlanForm, { plannedArrivalDate: '', inboundCode: target.inboundCode === '—' ? '' : target.inboundCode, palletCount: typeof target.pallets === 'number' && target.pallets > 0 ? target.pallets : 1, palletType: 'STANDARD', assigned: false, mergeRequired: false, urgent: false, remark: '' })
+  actionError.value = null
+  inboundPlanOpen.value = true
+}
+async function submitInboundPlan() {
+  const row = actionTarget.value
+  const frozenInboundCode = String(row?.inboundCode || '').trim()
+  if (!row || !row.overseasWarehouseId || !inboundPlanForm.plannedArrivalDate || !frozenInboundCode || frozenInboundCode === '—' || inboundPlanForm.palletCount < 1) {
+    ElMessage.warning('当前柜须已分配接柜仓，并完整填写预计到仓日期和托数')
    return
  }
-  actionLoading.value = true
-  actionError.value = null
+  actionLoading.value = true; actionError.value = null
  try {
-    await convertLastMileOrderToInboundPlan({ orderId: String(selected.id), customerId })
-    selectedRows.value = []
-    ElMessage.success('入库计划生成成功')
-    await load()
-  } catch (error) {
-    actionError.value = getApiErrorDetails(error, '生成入库计划失败，请重试')
-  } finally {
-    actionLoading.value = false
-  }
+    await createManualInboundPlan({
+      customerId: row.customerId, orderId: row.id, expectedOrderVersion: row.version,
+      plannedArrivalDate: inboundPlanForm.plannedArrivalDate,
+      palletCount: inboundPlanForm.palletCount,
+      palletType: inboundPlanForm.palletType, assigned: inboundPlanForm.assigned,
+      mergeRequired: inboundPlanForm.mergeRequired, urgent: inboundPlanForm.urgent,
+      remark: inboundPlanForm.remark.trim() || undefined,
+    }, idempotencyKey('manual-inbound-plan'))
+    inboundPlanOpen.value = false; selectedRows.value = []; ElMessage.success('入库计划已生成'); await load()
+  } catch (error) { actionError.value = getApiErrorDetails(error, '生成入库计划失败，请重试') }
+  finally { actionLoading.value = false }
+}
+function openHold(source: object) {
+  const row = source as LastMileOrderListItem
+  actionTarget.value = row
+  Object.assign(holdForm, { held: !row.detained, chargeable: row.detained ? false : true, reason: '' })
+  actionError.value = null
+  holdOpen.value = true
+}
+async function submitHold() {
+  const row = actionTarget.value
+  if (!row || !holdForm.reason.trim()) { ElMessage.warning('请输入变更原因'); return }
+  actionLoading.value = true; actionError.value = null
+  try {
+    await updateLastMileOrderHold(row.id, { held: holdForm.held, chargeable: holdForm.chargeable, reason: holdForm.reason.trim(), expectedVersion: row.version }, idempotencyKey('last-mile-hold'))
+    holdOpen.value = false; ElMessage.success(holdForm.held ? '订单已暂扣' : '订单已解除暂扣'); await load()
+  } catch (error) { actionError.value = getApiErrorDetails(error, '暂扣状态保存失败，请重试') }
+  finally { actionLoading.value = false }
+}
+async function openManualNodes(source: object) {
+  const row = source as LastMileOrderListItem
+  actionTarget.value = row
+  manualNodesOpen.value = true
+  manualNodesLoading.value = true
+  actionError.value = null
+  manualNodeDefinitions.forEach(({ code }) => { manualNodeValues[code] = null })
+  try {
+    const result = await getLastMileOrderManualNodes(row.id)
+    manualNodesVersion.value = result.version
+    result.nodes.forEach((node) => { manualNodeValues[node.nodeCode] = node.nodeAt })
+  } catch (error) { actionError.value = getApiErrorDetails(error, '人工节点加载失败，请重试') }
+  finally { manualNodesLoading.value = false }
+}
+async function submitManualNodes() {
+  const row = actionTarget.value
+  if (!row || !manualNodeDefinitions.some(({ code }) => Boolean(manualNodeValues[code]))) { ElMessage.warning('请至少填写一个节点时间'); return }
+  actionLoading.value = true; actionError.value = null
+  try {
+    await updateLastMileOrderManualNodes(row.id, manualNodesVersion.value, manualNodeDefinitions.map(({ code }) => ({ nodeCode: code, nodeAt: manualNodeValues[code] })), idempotencyKey('last-mile-manual-nodes'))
+    manualNodesOpen.value = false; ElMessage.success('人工节点已保存，该订单不再继承柜级节点'); await load()
+  } catch (error) { actionError.value = getApiErrorDetails(error, '人工节点保存失败，请重试') }
+  finally { actionLoading.value = false }
 }
 async function loadContainerOptions(containerNo = '') {
  const request = ++containerOptionRequest
@@ -398,7 +593,7 @@ onMounted(() => { void load() })
          <el-radio-button value="待分配">待分配</el-radio-button>
          <el-radio-button value="柜子">柜子工作台（{{ containerTotal }}）</el-radio-button>
        </el-radio-group>
-        <QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="尾程订单筛选" preference-key="overseas-last-mile-orders-query" @search="search" @reset="reset" />
+        <QueryToolbar v-model="filters" :fields="fields" :available-fields="allFields" :loading="loading" ariaLabel="尾程订单筛选" preference-key="overseas-last-mile-orders-query" :search-on-reset="false" @search="search" @reset="reset" />
      </section>
    </template>
    <template v-if="loadError" #state>
@@ -411,12 +606,17 @@ onMounted(() => { void load() })
    </LoadErrorState>
    <section v-if="!loadError && statusTab === '柜子'" class="surface-panel container-workbench" :aria-busy="loading">
      <header class="container-workbench__header">
-        <div><strong>待处理柜工作台</strong><span>按计划到仓时间由近到远排列，已全部生成计划的柜不再展示</span></div>
-        <el-tag type="warning" effect="plain">{{ containerTotal }} 个柜待处理</el-tag>
+        <div><strong>货柜工作台</strong><span>按柜查看和修改海外接柜仓，并为剩余入仓码生成独立入库计划</span></div>
+        <el-tag type="warning" effect="plain">{{ containerTotal }} 个货柜</el-tag>
      </header>
      <div v-if="containerRows.length" class="container-workbench__grid">
        <article v-for="container in containerRows" :key="container.sourceContainerBookingId" class="container-workbench-card">
-          <span class="container-workbench-card__top"><strong>{{ container.containerNo || '柜号待补充' }}</strong></span>
+          <span class="container-workbench-card__top"><strong :title="container.containerNo || '柜号待补充'">{{ container.containerNo || '柜号待补充' }}</strong></span>
+          <span class="container-workbench-card__warehouse">
+            <small>海外接柜仓</small><strong :title="receivingWarehouseLabel(container)">{{ receivingWarehouseLabel(container) }}</strong>
+            <small v-if="containerSnapshotBlockReason(container)" class="is-locked" :title="containerSnapshotBlockReason(container)">{{ containerSnapshotBlockReason(container) }}</small>
+            <small v-else-if="!container.canChangeReceivingWarehouse && container.receivingWarehouseLockReason" class="is-locked" :title="container.receivingWarehouseLockReason">{{ container.receivingWarehouseLockReason }}</small>
+          </span>
          <span class="container-workbench-card__arrival"><small>计划到仓</small><strong>{{ formatDateTime(container.plannedArrivalAt) }}</strong></span>
          <span class="container-workbench-card__pending">
            <strong>{{ pendingInboundCodeCount(container) }}</strong><span>个入仓码待生成计划</span>
@@ -426,19 +626,22 @@ onMounted(() => { void load() })
          </span>
          <span class="container-workbench-card__actions">
            <el-button class="container-workbench-card__detail" plain @click="openContainerDetail(container)">查看详情</el-button>
+            <el-tooltip :content="receivingWarehouseChangeDisabledReason(container)" :disabled="!receivingWarehouseChangeDisabledReason(container)" placement="top">
+              <span><el-button plain :title="receivingWarehouseChangeDisabledReason(container) || '修改接柜仓'" :disabled="Boolean(receivingWarehouseChangeDisabledReason(container))" @click="openReceivingWarehouseChange(container)"><Pencil :size="15" />修改接柜仓</el-button></span>
+            </el-tooltip>
            <el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading || !canGenerateContainerPlans(container)" @click="openContainerConversionFor(container)">生成入库计划</el-button>
          </span>
        </article>
      </div>
-      <el-empty v-else-if="!loading" description="暂无待处理柜，所有柜均已完成计划分配" />
+      <el-empty v-else-if="!loading" description="暂无货柜数据" />
      <div v-if="containerTotal" class="container-workbench__pagination">
-        <span>共 {{ containerTotal }} 个待处理柜</span>
+        <span>共 {{ containerTotal }} 个货柜</span>
        <el-pagination :current-page="page" :page-size="pageSize" :page-sizes="[10, 20, 50]" :total="containerTotal" layout="sizes, prev, pager, next" background @current-change="changeContainerPage" @size-change="changeContainerPageSize" />
      </div>
    </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="convertInboundPlan">生成入库计划</el-button><el-button v-if="statusTab === '待分配' && access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading" @click="openContainerConversion">按柜批量生成</el-button></template>
-      <template #actions="{ row }"><el-button size="small" plain type="primary" @click="openDetail(row)"><Eye :size="15" />查看</el-button></template>
+      <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"><el-button size="small" plain type="primary" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-dropdown v-if="access.can(permission.lastMileOrderTransfer) || access.can(permission.inboundOrderCreate)" trigger="click"><el-button size="small" plain>更多</el-button><template #dropdown><el-dropdown-menu><el-dropdown-item v-if="access.can(permission.inboundOrderCreate)" :disabled="row.detained" @click="openInboundPlan(row)">填写入库计划</el-dropdown-item><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 #orderNo="{ row }"><OrderReferenceText :value="String(row.orderNo || '')" copyable /></template>
      <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
    </DataTable></section>
@@ -478,23 +681,74 @@ onMounted(() => { void load() })
    <template v-else-if="containerDetail">
      <div class="container-detail-summary">
        <span>柜号：{{ containerDetail.summary.containerNo || '—' }}</span>
+        <span :title="`海外接柜仓：${receivingWarehouseLabel(containerDetail.summary)}`">海外接柜仓：{{ receivingWarehouseLabel(containerDetail.summary) }}</span>
        <span>计划到仓：{{ formatDateTime(containerDetail.summary.plannedArrivalAt) }}</span>
        <span>订单：{{ containerDetail.summary.totalOrderCount }}</span>
        <span>入仓码：{{ containerDetail.summary.inboundCodeCount }}</span>
        <span>入库计划：{{ containerDetail.summary.planCount }}，待生成 {{ pendingInboundCodeCount(containerDetail.summary) }}</span>
+        <span v-if="!containerDetail.summary.canChangeReceivingWarehouse">修改状态：{{ containerDetail.summary.receivingWarehouseLockReason || '当前已锁定' }}</span>
      </div>
      <DataTable :data="containerDetail.orders" :columns="containerDetailColumns" :loading="containerDetailLoading" preference-key="overseas-last-mile-container-detail" row-key="orderId" :total="undefined" empty-text="该柜暂无尾程订单">
+        <template #orderStatus="{ row }">{{ lastMileStatusLabel((row as ContainerPlanProgressDetailDto['orders'][number]).orderStatus) }}</template>
+        <template #planStatus="{ row }">{{ inboundPlanStatusLabel((row as ContainerPlanProgressDetailDto['orders'][number]).planStatus) }}</template>
        <template #plannedArrivalAt="{ row }">{{ formatDateTime((row as ContainerPlanProgressDetailDto['orders'][number]).plannedArrivalAt) }}</template>
      </DataTable>
    </template>
  </AppDialog>
+  <AppDialog v-model="receivingWarehouseOpen" title="修改海外接柜仓" width="min(600px, calc(100vw - 28px))" confirm-text="确认修改" :loading="receivingWarehouseLoading" :confirm-loading="actionLoading" :confirm-disabled="!selectedReceivingWarehouse || Boolean(receivingWarehouseError)" @confirm="submitReceivingWarehouseChange">
+    <LoadErrorState v-if="receivingWarehouseError" title="海外接柜仓候选加载失败" :message="receivingWarehouseError.message" compact @retry="loadReceivingWarehouseOptions">
+      <template #details><ApiErrorMeta :details="receivingWarehouseError" /></template>
+    </LoadErrorState>
+    <el-form v-else label-position="top">
+      <el-form-item label="当前海外接柜仓"><el-input :model-value="receivingWarehouseLabel(receivingWarehouseTarget)" readonly /></el-form-item>
+      <el-form-item label="新的海外接柜仓" required>
+        <el-select v-model="receivingWarehouseForm.warehouseId" filterable clearable placeholder="请选择 ACTIVE 海外接柜仓">
+          <el-option v-for="warehouse in receivingWarehouseOptions" :key="warehouse.warehouseId" :label="warehouse.label" :value="warehouse.warehouseId" :disabled="warehouse.warehouseId === receivingWarehouseTarget?.overseasWarehouseId" />
+        </el-select>
+      </el-form-item>
+      <el-alert v-if="receivingWarehouseForm.warehouseId === receivingWarehouseTarget?.overseasWarehouseId" title="新的海外接柜仓必须与当前仓不同" type="warning" :closable="false" show-icon />
+      <el-alert v-if="!receivingWarehouseLoading && !receivingWarehouseOptions.length" title="暂无可用的 ACTIVE 海外接柜仓" type="info" :closable="false" show-icon />
+      <el-form-item label="备注"><el-input v-model="receivingWarehouseForm.remark" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="请输入修改备注（选填）" /></el-form-item>
+      <LoadErrorState v-if="receivingWarehouseActionError" title="海外接柜仓修改失败" :message="receivingWarehouseActionError.message" compact>
+        <template #details><ApiErrorMeta :details="receivingWarehouseActionError" /></template>
+      </LoadErrorState>
+    </el-form>
+  </AppDialog>
+  <AppDialog v-model="inboundPlanOpen" title="入库计划" width="min(720px, calc(100vw - 28px))" confirm-text="保存并生成入库单" :confirm-loading="actionLoading" @confirm="submitInboundPlan">
+    <el-alert title="保存后生成入库单；清关完成后入库计划不可更改。" type="info" :closable="false" show-icon />
+    <el-form class="command-form" label-position="top">
+      <div class="command-form__grid"><el-form-item label="计划入库仓"><el-input :model-value="inboundPlanWarehouseLabel" disabled placeholder="当前柜接柜仓" /><small>接柜仓按柜统一；如需变更，请在柜子工作台执行“变更接柜仓”。</small></el-form-item><el-form-item label="预计到仓日期" required><el-date-picker v-model="inboundPlanForm.plannedArrivalDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择日期" /></el-form-item><el-form-item label="入仓码"><el-input :model-value="inboundPlanForm.inboundCode" disabled placeholder="订单冻结入仓码" /></el-form-item><el-form-item label="托数" required><el-input-number v-model="inboundPlanForm.palletCount" :min="1" :max="999" controls-position="right" placeholder="请输入托数" /></el-form-item><el-form-item label="托盘类型"><el-select v-model="inboundPlanForm.palletType" placeholder="请选择托盘类型"><el-option label="标准托盘" value="STANDARD" /><el-option label="木托盘" value="WOOD" /><el-option label="纸托盘" value="PAPER" /></el-select></el-form-item><el-form-item label="是否分配"><el-switch v-model="inboundPlanForm.assigned" inline-prompt active-text="是" inactive-text="否" /></el-form-item><el-form-item label="是否合托"><el-switch v-model="inboundPlanForm.mergeRequired" inline-prompt active-text="是" inactive-text="否" /></el-form-item><el-form-item label="是否加急"><el-switch v-model="inboundPlanForm.urgent" inline-prompt active-text="是" inactive-text="否" /></el-form-item></div>
+      <el-form-item label="备注"><el-input v-model="inboundPlanForm.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="请输入备注（选填）" /></el-form-item>
+    </el-form>
+  </AppDialog>
+  <AppDialog v-model="holdOpen" :title="holdForm.held ? '暂扣订单' : '解除暂扣'" width="min(620px, calc(100vw - 28px))" confirm-text="保存" :confirm-loading="actionLoading" @confirm="submitHold">
+    <el-alert :title="holdForm.held ? '暂扣后不可创建出库计划；解除暂扣后恢复出库计划操作。' : '解除暂扣后恢复该订单的出库计划操作。'" type="warning" :closable="false" show-icon />
+    <el-form class="command-form" label-position="top"><div class="command-form__grid"><el-form-item label="暂扣状态" required><el-radio-group v-model="holdForm.held"><el-radio :value="true">暂扣</el-radio><el-radio :value="false">解除暂扣</el-radio></el-radio-group></el-form-item><el-form-item label="是否计费" required><el-radio-group v-model="holdForm.chargeable"><el-radio :value="true">是</el-radio><el-radio :value="false">否</el-radio></el-radio-group></el-form-item></div><el-form-item label="变更原因" required><el-input v-model="holdForm.reason" type="textarea" :rows="4" maxlength="500" show-word-limit placeholder="请输入暂扣或解除暂扣原因" /></el-form-item></el-form>
+  </AppDialog>
+  <AppDialog v-model="manualNodesOpen" title="人工修改节点" width="min(700px, calc(100vw - 28px))" confirm-text="保存" :loading="manualNodesLoading" :confirm-loading="actionLoading" @confirm="submitManualNodes">
+    <div class="manual-node-order"><span>尾程单号</span><strong>{{ actionTarget?.orderNo || '—' }}</strong></div>
+    <el-alert title="保存后该订单只显示人工节点，不再跟随柜级节点；请至少填写一个节点时间。" type="warning" :closable="false" show-icon />
+    <div class="manual-node-table"><div class="manual-node-table__head"><span>节点</span><span>节点时间</span></div><div v-for="node in manualNodeDefinitions" :key="node.code" class="manual-node-table__row"><span>{{ node.label }}</span><el-date-picker v-model="manualNodeValues[node.code]" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="年/月/日 --:--" /></div></div>
+  </AppDialog>
 </template>

 <style scoped>
 .last-mile-toolbar { padding: 14px 16px 0; }
+.row-actions { display: flex; align-items: center; gap: 6px; white-space: nowrap; }
+.row-actions :deep(.el-button + .el-button) { margin-left: 0; }
+.command-form { margin-top: 16px; }
+.command-form__grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 18px; }
+.command-form :deep(.el-select), .command-form :deep(.el-date-editor), .command-form :deep(.el-input-number) { width: 100%; }
+.manual-node-order { display: flex; justify-content: space-between; gap: 16px; margin-bottom: 12px; padding: 12px 14px; border: 1px solid var(--cc-border); border-radius: 6px; background: var(--cc-surface); }
+.manual-node-table { max-height: 420px; margin-top: 14px; overflow: auto; border: 1px solid var(--cc-border); border-radius: 6px; }
+.manual-node-table__head, .manual-node-table__row { display: grid; grid-template-columns: 42% 58%; align-items: center; gap: 12px; padding: 10px 14px; }
+.manual-node-table__head { position: sticky; top: 0; z-index: 1; background: var(--cc-surface); color: var(--cc-muted); font-size: 13px; font-weight: 600; }
+.manual-node-table__row { border-top: 1px solid var(--cc-border); }
+.manual-node-table__row :deep(.el-date-editor) { width: 100%; }
 .last-mile-toolbar :deep(.query-toolbar) { margin-top: 12px; padding: 12px 0 16px; border: 0; border-top: 1px solid var(--cc-border); border-radius: 0; }
 .container-convert-hint { margin: 0 0 16px; color: var(--cc-muted); line-height: 1.6; }
 .container-detail-summary { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 8px 16px; margin-bottom: 12px; padding: 12px 14px; border: 1px solid var(--cc-border); border-radius: 6px; background: var(--cc-surface); font-size: 13px; }
+.container-detail-summary > span { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .container-workbench { padding: 18px; }
 .container-workbench__header { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin-bottom: 16px; }
 .container-workbench__header > div { display: grid; gap: 4px; }
@@ -504,17 +758,22 @@ onMounted(() => { void load() })
 .container-workbench-card { display: grid; min-width: 0; gap: 14px; padding: 16px; border: 1px solid var(--cc-border); border-radius: 8px; background: #fff; color: inherit; font: inherit; text-align: left; transition: border-color .16s ease, box-shadow .16s ease; }
 .container-workbench-card:hover { border-color: var(--cc-primary); box-shadow: 0 6px 18px rgb(15 23 42 / 8%); }
 .container-workbench-card__top { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
-.container-workbench-card__top strong { min-width: 0; overflow-wrap: anywhere; color: var(--cc-text); font-size: 16px; }
+.container-workbench-card__top strong { min-width: 0; overflow: hidden; color: var(--cc-text); font-size: 16px; text-overflow: ellipsis; white-space: nowrap; }
 .container-workbench-card__top > span { flex: 0 0 auto; color: var(--cc-primary); font-size: 13px; }
 .container-workbench-card__arrival { display: grid; gap: 4px; }
 .container-workbench-card__arrival small { color: var(--cc-muted); font-size: 12px; }
 .container-workbench-card__arrival strong { color: var(--cc-text); font-size: 15px; }
+.container-workbench-card__warehouse { display: grid; gap: 4px; }
+.container-workbench-card__warehouse small { color: var(--cc-muted); font-size: 12px; }
+.container-workbench-card__warehouse strong { min-width: 0; overflow: hidden; color: var(--cc-text); font-size: 14px; text-overflow: ellipsis; white-space: nowrap; }
+.container-workbench-card__warehouse .is-locked { min-width: 0; overflow: hidden; color: #c2410c; text-overflow: ellipsis; white-space: nowrap; }
 .container-workbench-card__pending { display: flex; align-items: baseline; gap: 8px; padding: 12px 14px; border-left: 3px solid #f59e0b; background: #fffaf0; }
 .container-workbench-card__pending strong { color: #b45309; font-size: 28px; line-height: 1; }
 .container-workbench-card__pending span { color: #92400e; font-size: 13px; }
 .container-workbench-card__facts { display: flex; flex-wrap: wrap; gap: 6px 12px; color: var(--cc-muted); font-size: 12px; }
 .container-workbench-card__facts .is-warning { color: #c2410c; }
-.container-workbench-card__actions { display: flex; justify-content: flex-end; gap: 8px; padding-top: 2px; }
+.container-workbench-card__actions { display: flex; justify-content: flex-end; gap: 8px; padding-top: 2px; white-space: nowrap; }
+.container-workbench-card__actions :deep(.el-button + .el-button) { margin-left: 0; }
 .container-workbench__pagination { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin-top: 18px; padding-top: 14px; border-top: 1px solid var(--cc-border); color: var(--cc-muted); font-size: 13px; }
@media (max-width: 1380px) { .container-workbench__grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
 </style>
@@ -14,6 +14,7 @@ describe('OutboundDetailView', () => {
    canPermission.mockReset().mockReturnValue(false)
    vi.mocked(getOutbound).mockReset().mockResolvedValue({
      outbound: { id: '1', outboundNo: 'OUT/1', dispatchNo: 'PC-1', status: 'PICKED', palletCount: 2, packageCount: 20, createdAt: '2026-09-01T10:00:00' },
+      pallets: [{ palletNo: 'IP-ACY2-20260907-597057-P001', inboundCode: 'NYEXX2609060063', destinationWarehouseCode: 'ONT8', destinationWarehouseName: 'Amazon ONT8', skuCode: 'SKU-001', packageCount: 20 }],
      delivery: { id: '2', customerId: 'customer-1', deliveryNo: 'DEL-1', outboundNo: 'OUT/1', dispatchNo: 'PC-1', status: 'WAIT_DELIVERY', palletCount: 2, packageCount: 20, createdAt: '2026-09-01T10:00:00' },
    })
  })
@@ -25,10 +26,39 @@ describe('OutboundDetailView', () => {
    expect(wrapper.text()).toContain('OUT/1')
    expect(wrapper.text()).toContain('PC-1')
    expect(wrapper.text()).toContain('DEL-1')
+    expect(wrapper.text()).toContain('出库托盘')
+    expect(wrapper.text()).toContain('IP-ACY2-20260907-597057-P001')
+    expect(wrapper.text()).toContain('NYEXX2609060063')
+    expect(wrapper.text()).toContain('Amazon ONT8')
+    expect(wrapper.text()).toContain('SKU-001')
+    expect(wrapper.findAll('.outbound-pallet-table .data-table__single-line-cell').length).toBeGreaterThanOrEqual(6)
    expect(wrapper.text()).not.toContain('取消出库单')
    wrapper.unmount()
  })

+  it('renders pallet missing values consistently and keeps the empty state in the table', async () => {
+    vi.mocked(getOutbound).mockResolvedValueOnce({
+      outbound: { id: '1', outboundNo: 'OUT/1', status: 'OUTBOUNDED' },
+      pallets: [{ palletNo: null, inboundCode: null, destinationWarehouseCode: null, destinationWarehouseName: null, skuCode: null, packageCount: null }],
+      delivery: null,
+    })
+    const wrapper = mount(OutboundDetailView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(wrapper.get('.outbound-pallet-table').text()).toContain('—')
+    expect(wrapper.text()).toContain('暂无关联派送单')
+    wrapper.unmount()
+
+    vi.mocked(getOutbound).mockResolvedValueOnce({
+      outbound: { id: '1', outboundNo: 'OUT/1', status: 'OUTBOUNDED' },
+      pallets: [],
+      delivery: null,
+    })
+    const emptyWrapper = mount(OutboundDetailView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(emptyWrapper.text()).toContain('暂无出库托盘')
+    emptyWrapper.unmount()
+  })
+
  it('shows cancellation only for PICKED with the independent permission', async () => {
    canPermission.mockImplementation((code: string) => code === 'platform:overseas-warehouse:outbound:cancel')
    const wrapper = mount(OutboundDetailView, { global: { plugins: [ElementPlus] } })
@@ -6,6 +6,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
@@ -18,12 +19,21 @@ import { overseasWarehousePermissions as permission } from '../permissions'
 const route = useRoute(); const router = useRouter(); const access = useAccessPreviewStore()
 const outboundNo = computed(() => String(route.params.outboundNo || '').trim())
 const detail = ref<OutboundDetail | null>(null); const loading = ref(false); const cancelling = ref(false)
-const palletRows = computed(() => detail.value?.pallets || [])
 const loadError = ref<ApiErrorDetails | null>(null); const mutationError = ref<ApiErrorDetails | null>(null)
 const statusLabels: Record<string, string> = { WAIT_OUTBOUND: '待出库', PICKING: '拣货中', PICKED: '已拣货', OUTBOUNDED: '已出库', CANCELLED: '已取消' }
+const palletColumns: DataTableColumn[] = [
+  { key: 'palletNo', label: '托盘码', width: 220 },
+  { key: 'inboundCode', label: '入仓码', width: 190 },
+  { key: 'destinationWarehouseCode', label: '目的仓编码', width: 150 },
+  { key: 'destinationWarehouseName', label: '目的仓名称', minWidth: 180 },
+  { key: 'skuCode', label: '商品 SKU', width: 170 },
+  { key: 'cartonMarks', label: '箱唛', minWidth: 220 },
+  { key: 'packageCount', label: '箱数', width: 100, align: 'right' },
+  { key: 'pickedPackageCount', label: '已拣箱数', width: 110, align: 'right' },
+  { key: 'status', label: '状态', width: 110 },
+]
 function show(value: unknown) { const text = String(value ?? '').trim(); return text || '—' }
 function statusLabel(value: unknown) { const code = String(value || ''); return statusLabels[code] || show(code) }
-function marks(value: unknown) { return String(value || '').split(',').map((item) => item.trim()).filter(Boolean) }
 const canCancel = computed(() => access.can(permission.outboundCancel) && detail.value?.outbound.status === 'PICKED')
 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}？`, '取消出库单', { 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 } }
@@ -36,8 +46,7 @@ watch(outboundNo, () => { void load() }, { immediate: true })
    <template #header><div class="detail-heading"><el-button 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 :column="4" border><el-descriptions-item label="出库单号">{{ show(detail.outbound.outboundNo) }}</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="海外仓">{{ show(detail.outbound.overseasWarehouseId) }}</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><el-empty v-if="!detail.delivery" description="暂无关联派送单" :image-size="56" /><el-descriptions v-else :column="4" border><el-descriptions-item label="派送单号">{{ show(detail.delivery.deliveryNo) }}</el-descriptions-item><el-descriptions-item label="派送状态">{{ show(detail.delivery.status) }}</el-descriptions-item><el-descriptions-item label="运单号">{{ show(detail.delivery.waybillNo) }}</el-descriptions-item><el-descriptions-item label="承运商">{{ show(detail.delivery.carrierName) }}</el-descriptions-item><el-descriptions-item label="司机">{{ show(detail.delivery.driverName) }}</el-descriptions-item><el-descriptions-item label="车牌">{{ show(detail.delivery.vehiclePlate) }}</el-descriptions-item><el-descriptions-item label="计划派送">{{ formatOverseasDateTime(detail.delivery.plannedDeliveryAt) }}</el-descriptions-item><el-descriptions-item label="备注">{{ show(detail.delivery.remark) }}</el-descriptions-item></el-descriptions></section>
-    <section class="surface-panel detail-section"><h2>出库箱唛明细</h2><el-empty v-if="!palletRows.length" description="暂无箱唛快照" :image-size="56" /><el-table v-else :data="palletRows" border size="small"><el-table-column label="托盘" prop="palletNo" min-width="130" /><el-table-column label="入仓单" prop="inboundCode" min-width="130" /><el-table-column label="SKU" prop="skuCode" min-width="120" /><el-table-column label="指定箱唛" min-width="260"><template #default="scope"><el-tag v-for="mark in marks(scope.row.cartonMarks)" :key="mark" size="small" effect="plain" class="mark-tag">{{ mark }}</el-tag><span v-if="!marks(scope.row.cartonMarks).length">—</span></template></el-table-column><el-table-column label="计划/已拣" width="110"><template #default="scope">{{ scope.row.pickedPackageCount ?? 0 }} / {{ scope.row.packageCount ?? 0 }}</template></el-table-column><el-table-column label="状态" width="100"><template #default="scope">{{ statusLabel(scope.row.status) }}</template></el-table-column></el-table></section></template>
+    <template v-else-if="detail"><section class="surface-panel detail-section"><h2>出库信息</h2><el-descriptions :column="4" border><el-descriptions-item label="出库单号">{{ show(detail.outbound.outboundNo) }}</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="海外仓">{{ show(detail.outbound.overseasWarehouseId) }}</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.delivery" description="暂无关联派送单" :image-size="56" /><el-descriptions v-else :column="4" border><el-descriptions-item label="派送单号">{{ show(detail.delivery.deliveryNo) }}</el-descriptions-item><el-descriptions-item label="派送状态">{{ show(detail.delivery.status) }}</el-descriptions-item><el-descriptions-item label="运单号">{{ show(detail.delivery.waybillNo) }}</el-descriptions-item><el-descriptions-item label="承运商">{{ show(detail.delivery.carrierName) }}</el-descriptions-item><el-descriptions-item label="司机">{{ show(detail.delivery.driverName) }}</el-descriptions-item><el-descriptions-item label="车牌">{{ show(detail.delivery.vehiclePlate) }}</el-descriptions-item><el-descriptions-item label="计划派送">{{ formatOverseasDateTime(detail.delivery.plannedDeliveryAt) }}</el-descriptions-item><el-descriptions-item label="备注">{{ show(detail.delivery.remark) }}</el-descriptions-item></el-descriptions></section></template>
  </DetailPageLayout></AdminPage>
 </template>

@@ -28,7 +28,7 @@ const customerOptions = computed(() => {
  return [...customers].map(([value, label]) => ({ value, label }))
 })
 const availablePositionOptions = computed(() => positionOptions.value.filter(({ balance }) => balance.customerId === selectedCustomerId.value))
-const columns: DataTableColumn[] = [{ key: 'actions', label: '操作', width: 190, fixed: 'left', slotName: 'actions' }, { key: 'outboundNo', prop: 'outboundNo', label: '出库单号', minWidth: 180 }, { 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 columns: DataTableColumn[] = [{ key: 'actions', label: '操作', width: 180, fixed: 'left', slotName: 'actions' }, { key: 'outboundNo', prop: 'outboundNo', label: '出库单号', minWidth: 180 }, { 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_OUTBOUND' }, { label: '已出库', value: 'OUTBOUNDED' }] }]

 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 }); 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 } }
@@ -45,7 +45,7 @@ onMounted(load)
 <template>
  <AdminPage><ListPageLayout aria-label="出库单">
    <OperationErrorToast :details="mutationError" />
-    <template #toolbar><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="出库单筛选" preference-key="overseas-outbounds-query" @search="search" @reset="reset" /></template>
+    <template #toolbar><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="出库单筛选" preference-key="overseas-outbounds-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
    <template v-if="error" #state><LoadErrorState title="出库单列表加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
    <section v-if="!error" 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-outbounds" row-key="id" empty-text="暂无出库单" @update:page="load()" @update:page-size="page = 1; load()">
      <template #toolbar-actions><el-button v-if="access.can(permission.outboundCreate)" type="primary" @click="openCreate"><Plus :size="16" />一件代发出库</el-button></template>
@@ -41,7 +41,7 @@ const fields = computed<QueryField[]>(() => [
  { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 140, options: [{ label: '闲置', value: 'IDLE' }, { label: '占用', value: 'OCCUPIED' }, { label: '已报废', value: 'SCRAPPED' }] },
 ])
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 250, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 180, fixed: 'left', slotName: 'actions' },
  { key: 'code', prop: 'code', label: '托盘编码', minWidth: 160 }, { key: 'type', prop: 'type', label: '托盘类型', minWidth: 130 },
  { key: 'warehouse', prop: 'warehouse', label: '仓库', minWidth: 180 }, { key: 'volume', prop: 'volume', label: '容积(m³)', width: 110, align: 'right' },
  { key: 'purchasePrice', prop: 'purchasePrice', label: '采购价格', width: 120, align: 'right' }, { key: 'fbaWarehouse', prop: 'fbaWarehouse', label: '所属FBA仓', minWidth: 140 },
@@ -37,7 +37,7 @@ const fields = computed<QueryField[]>(() => [
  { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 160, options: [{ label: '待处理', value: 'PENDING_PROCESSING' }, { label: '处理中', value: 'PROCESSING' }, { label: '已完成', value: 'COMPLETED' }, { label: '已驳回', value: 'REJECTED' }, { label: '已取消', value: 'CANCELLED' }] },
 ])
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 190, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 180, fixed: 'left', slotName: 'actions' },
  { key: 'orderNo', label: '换标单号', minWidth: 170 },
  { key: 'sku', label: '商品SKU', minWidth: 150 },
  { key: 'productName', label: '中文品名', minWidth: 180 },
@@ -177,7 +177,7 @@ watch(dialogOpen, (open) => { if (!open) createIdempotencyKey.value = '' })

 <template>
  <AdminPage><ListPageLayout aria-label="换标单列表">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="换标单筛选" preference-key="overseas-relabel-orders-query" @search="search" @reset="reset" /></template>
+    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="换标单筛选" preference-key="overseas-relabel-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
    <template v-if="loadError" #state><LoadErrorState title="换标单加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
    <section v-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-relabel-orders" row-key="orderNo" empty-text="暂无换标单" @update:page="load()" @update:page-size="page = 1; load()">
      <template #toolbar-actions><el-button v-if="access.can(permission.relabelOrderCreate)" type="primary" @click="openForm('create')"><Plus :size="16" />新增换标单</el-button></template>
@@ -151,7 +151,7 @@ describe('overseas warehouse first-batch prototype contract', () => {
    expect(tailLeg).toContain('<OrderReferenceText :value="referenceValue" copyable />')
    const inbound = source('InboundOrderDetailView.vue')
    expect(inbound).toContain('getInboundPlan')
-    expect(inbound).toContain('sourceOrderId')
+    expect(inbound).not.toContain('detail.value?.sourceOrderId')
    expect(inbound).toContain('<LoadErrorState')
    const inventory = source('InventoryDetailView.vue')
    expect(inventory).toContain('listInventoryPositions')
@@ -198,6 +198,7 @@ describe('overseas warehouse first-batch prototype contract', () => {
    expect(value).toContain('createFbaAppointment')
    expect(value).toContain('预计装车时间')
    expect(value).toContain('所选入库单必须属于同一 FBA 仓库')
+    expect(value).toContain('anchor.customerId === row.customerId')
    expect(value).toContain('<CalendarCheck2 :size="16" />预约')
    expect(value).toContain('<Truck :size="16" />智能排车')
    expect(value).toContain('type="primary" @click="openSmartDispatch"')
@@ -247,6 +248,8 @@ describe('overseas warehouse first-batch prototype contract', () => {
    expect(dialog).not.toContain(':model-value="fbaWarehouseCode" readonly')
    expect(dialog).toContain("sourceStage: 'RECEIVED'")
    expect(dialog).toContain('一次排车只能装同一客户的托盘')
+    expect(dialog).toContain('该托盘尚未关联海外仓，不能排车')
+    expect(dialog).toContain('所选托盘中存在尚未关联海外仓的托盘')
    expect(dialog).toContain('function ensureDraftToken()')
    expect(dialog).toContain('lockDispatchDraftPallet(id, ensureDraftToken(), target.id)')
    expect(dialog).toContain('function hydrateDraftPallets()')
@@ -342,14 +345,14 @@ describe('overseas warehouse first-batch prototype contract', () => {

  it('keeps every prototype list column in its frozen order', () => {
    expect(columnKeys('LastMileOrdersView.vue')).toEqual([
-      'actions', 'selection', 'orderNo', 'consolidated', 'palletMergeRelation', 'warning', 'orderType', 'rejectedAt', 'inboundCode', 'owner', 'warehouse',
+      'actions', 'selection', 'orderNo', 'consolidated', 'palletMergeRelation', 'warning', 'orderType', 'rejectedAt', 'inboundCode', 'lxCode', 'owner', 'warehouse',
      'transferWarehouse', 'fbaWarehouse', 'containerNo', 'abnormal', 'held', 'pallets',
      'cartons', 'volume', 'quantity', 'volumeWeight', 'portEta', 'portAta', 'warehouseEta', 'inboundOrderNo',
      'outboundOrderNo', 'dispatchOrderNo', 'relabelOrderNo', 'relabelStatus', 'status',
      'createdAt', 'internalRemark', 'customerRemark', 'warehouseRemark',
    ])
    expect(columnKeys('InboundOrdersView.vue')).toEqual([
-      'actions', 'selection', 'orderNo', 'inboundCode', 'type', 'warehouse', 'fbaWarehouse', 'owner', 'cartons', 'pickedCartons', 'volume',
+      'actions', 'selection', 'orderNo', 'inboundCode', 'lxCode', 'type', 'warehouse', 'fbaWarehouse', 'owner', 'cartons', 'pickedCartons', 'volume',
      'pallets', 'status', 'appointmentStatus', 'dispatchStatus', 'createdAt',
    ])
    expect(columnKeys('InventoryView.vue')).toEqual([
@@ -3,16 +3,23 @@ import { createPinia } from 'pinia'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { listPlatformTenants } from '@/modules/iam'
+import DataTable from '@/shared/components/DataTable.vue'
+import { listInboundOrders } from '../api/inboundOrders'
 import { getInboundPlan } from '../api/inboundPlans'
 import { listInventoryLedger } from '../api/inventory'
 import { getLastMileOrder } from '../api/lastMileOrders'
 import InboundOrderDetailView from './InboundOrderDetailView.vue'
+import InboundOrdersView from './InboundOrdersView.vue'
 import InventoryTransactionsView from './InventoryTransactionsView.vue'
 import LastMileOrderDetailView from './LastMileOrderDetailView.vue'

 const routing = vi.hoisted(() => ({ push: vi.fn(), route: { params: {} as Record<string, string>, query: {} as Record<string, string> } }))
 vi.mock('vue-router', () => ({ useRoute: () => routing.route, useRouter: () => ({ push: routing.push }) }))
 vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
+vi.mock('../api/inboundOrders', () => ({
+  listInboundOrders: vi.fn(), createFbaAppointment: vi.fn(), getFbaAppointment: vi.fn(),
+  updateFbaAppointment: vi.fn(), updateInboundPlan: vi.fn(),
+}))
 vi.mock('../api/inboundPlans', () => ({ getInboundPlan: vi.fn() }))
 vi.mock('../api/inventory', () => ({ listInventoryLedger: vi.fn() }))
 vi.mock('../api/lastMileOrders', () => ({ getLastMileOrder: vi.fn(), createLastMileOrderFee: vi.fn() }))
@@ -24,11 +31,35 @@ describe('overseas warehouse mounted real API pages', () => {
  beforeEach(() => {
    vi.stubGlobal('ResizeObserver', ResizeObserverStub); vi.stubGlobal('localStorage', memoryStorage()); routing.push.mockReset(); routing.route.params = {}; routing.route.query = {}
    vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({ records: [{ id: '10001', tenantName: '客户甲', status: 'ACTIVE' } as never], page: 1, size: 200, total: 1, pages: 1 })
-    vi.mocked(getInboundPlan).mockReset().mockResolvedValue({ id: '9007199254740993', planNo: 'IP-1', customerId: '10001', sourceOrderId: '9007199254740995', status: 'PENDING_ASSIGNMENT', lineCount: 1, palletCount: 1, totalVolumeCbm: 2, lines: [{ id: '1', orderId: '9007199254740995', inboundCode: 'IN-1', fbaWarehouseCode: 'ONT8', destinationWarehouseName: '洛杉矶仓', volumeCbm: 2, requiredPackageCount: 10, plannedPalletCount: 1 }], pallets: [], allocations: [] })
+    vi.mocked(listInboundOrders).mockReset().mockResolvedValue({ records: [], page: 1, size: 10, total: 0, pages: 0 })
+    vi.mocked(getInboundPlan).mockReset().mockResolvedValue({ id: '9007199254740993', planNo: 'IP-1', customerId: '10001', sourceOrderId: '9007199254740995', overseasWarehouseCode: 'US-LAX-01', overseasWarehouseName: '洛杉矶接柜仓', status: 'PENDING_ASSIGNMENT', lineCount: 1, palletCount: 1, totalVolumeCbm: 2, lines: [{ id: '1', orderId: '9007199254740995', inboundCode: 'IN-1', fbaWarehouseCode: 'ABE3', destinationWarehouseCode: 'ABE3', destinationWarehouseName: 'ABE3目的仓', volumeCbm: 2, requiredPackageCount: 10, plannedPalletCount: 1 }], pallets: [], allocations: [] })
    vi.mocked(listInventoryLedger).mockReset().mockResolvedValue({ records: [{ id: '9007199254740997', customerId: '10001', customerName: '客户甲', destinationWarehouseCode: 'LAX', inboundCode: 'NYEXX2608300001', inboundOrderNo: 'IP-1', businessType: 'STOCK_IN', beforePackages: 0, deltaPackages: 10, afterPackages: 10, occurredAt: '2026-08-20T10:00:00' }], page: 1, size: 20, total: 1, pages: 1 })
-    vi.mocked(getLastMileOrder).mockReset().mockResolvedValue({ order: { id: '9007199254740999', customerId: '10001', customerName: '华远贸易', orderNo: 'LMO-260827-0001', currentStatus: 'PENDING_ASSIGNMENT' }, cargo: [], statusHistory: [], fees: [], operationHistory: [] })
+    vi.mocked(getLastMileOrder).mockReset().mockResolvedValue({ order: { id: '9007199254740999', customerId: '10001', customerName: '华远贸易', orderNo: 'LMO-260827-0001', inboundCode: 'NYEXX2608280033', containerNo: 'TSTU0000061', currentStatus: 'PENDING_ASSIGNMENT' }, cargo: [], statusHistory: [], fees: [], operationHistory: [] })
+  })
+  it('keeps receiving warehouse and FBA warehouse independent in the inbound-plan list', async () => {
+    vi.mocked(listInboundOrders).mockResolvedValue({
+      records: [
+        { lineId: '1', planId: '11', planNo: 'IP-1', customerId: '10001', orderId: '21', inboundCode: 'IN-1', overseasWarehouseCode: 'US-LAX-01', overseasWarehouseName: '洛杉矶接柜仓', warehouseId: '31', warehouseCode: 'ABE3', warehouseName: 'ABE3目的仓', fbaWarehouseCode: 'ABE3' },
+        { lineId: '2', planId: '12', planNo: 'IP-2', customerId: '10001', orderId: '22', inboundCode: 'IN-2', overseasWarehouseCode: null, overseasWarehouseName: '不充整接柜仓', warehouseId: '32', warehouseCode: 'ONT8', warehouseName: 'ONT8目的仓', fbaWarehouseCode: 'ONT8' },
+      ], page: 1, size: 10, total: 2, pages: 1,
+    })
+    const wrapper = mount(InboundOrdersView, { global: { plugins: [createPinia(), ElementPlus] } })
+    await flushPromises()
+    const rows = wrapper.findComponent(DataTable).props('data') as Array<{ warehouse: string; fbaWarehouse: string; destinationWarehouseName: string }>
+    expect(rows[0]).toMatchObject({ warehouse: 'US-LAX-01 · 洛杉矶接柜仓', fbaWarehouse: 'ABE3', destinationWarehouseName: 'ABE3目的仓' })
+    expect(rows[1]).toMatchObject({ warehouse: '—', fbaWarehouse: 'ONT8', destinationWarehouseName: 'ONT8目的仓' })
+  })
+  it('mounts inbound detail with independent receiving and FBA warehouse references', async () => { routing.route.params = { orderId: 'IP-1' }; routing.route.query = { customerId: '10001' }; const wrapper = mount(InboundOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises(); expect(getInboundPlan).toHaveBeenCalledWith('IP-1', '10001'); expect(wrapper.text()).toContain('IP-1'); expect(wrapper.text()).toContain('IN-1'); expect(wrapper.text()).not.toContain('9007199254740995'); expect(wrapper.text()).toContain('US-LAX-01 · 洛杉矶接柜仓'); expect(wrapper.text()).toContain('ABE3'); expect(wrapper.text()).not.toContain('ABE3目的仓') })
+  it('shows an empty receiving warehouse when either frozen field is missing without falling back to destination data', async () => {
+    vi.mocked(getInboundPlan).mockResolvedValueOnce({ id: '1', planNo: 'IP-2', customerId: '10001', sourceOrderId: '2', overseasWarehouseCode: null, overseasWarehouseName: '不充整接柜仓', status: 'PENDING_ASSIGNMENT', lineCount: 1, palletCount: 0, totalVolumeCbm: 0, lines: [{ id: '3', orderId: '2', inboundCode: 'IN-2', fbaWarehouseCode: 'ABE3', destinationWarehouseCode: 'ABE3', destinationWarehouseName: 'ABE3目的仓', requiredPackageCount: 1, plannedPalletCount: 0 }], pallets: [], allocations: [] })
+    routing.route.params = { orderId: 'IP-2' }; routing.route.query = { customerId: '10001' }
+    const wrapper = mount(InboundOrderDetailView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    const field = (label: string) => wrapper.findAll('dt').find((item) => item.text() === label)?.element.parentElement?.querySelector('dd')?.textContent
+    expect(field('海外仓')).toBe('—')
+    expect(field('FBA仓库')).toBe('ABE3')
+    expect(wrapper.text()).not.toContain('ABE3目的仓')
  })
-  it('mounts inbound detail with a string-safe source order id', async () => { routing.route.params = { orderId: 'IP-1' }; routing.route.query = { customerId: '10001' }; const wrapper = mount(InboundOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises(); expect(getInboundPlan).toHaveBeenCalledWith('IP-1', '10001'); expect(wrapper.text()).toContain('9007199254740995'); expect(wrapper.text()).toContain('洛杉矶仓') })
  it('mounts inventory ledger as localized read-only business facts without exposing internal ids', async () => { const wrapper = mount(InventoryTransactionsView, { global: { plugins: [createPinia(), ElementPlus] } }); await flushPromises(); expect(listInventoryLedger).toHaveBeenCalledWith(expect.objectContaining({ page: 1, size: 10 })); expect(listInventoryLedger).not.toHaveBeenCalledWith(expect.objectContaining({ customerId: expect.anything() })); expect(wrapper.text()).toContain('客户甲'); expect(wrapper.text()).toContain('NYEXX2608300001'); expect(wrapper.text()).not.toContain('10001'); expect(wrapper.text()).toContain('IP-1'); expect(wrapper.text()).toContain('10'); expect(wrapper.text()).toContain('入库'); expect(wrapper.text()).not.toContain('STOCK_IN'); expect(wrapper.text()).toContain('不提供出库单跳转'); expect(wrapper.text()).not.toContain('当前流水 DTO'); expect(wrapper.text()).not.toContain('操作人名称待补充') })
-  it('renders the backend owner and complete short order number in last-mile detail', async () => { routing.route.params = { orderId: '9007199254740999' }; const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [createPinia(), ElementPlus] } }); await flushPromises(); expect(getLastMileOrder).toHaveBeenCalledWith('9007199254740999'); expect(wrapper.text()).toContain('华远贸易'); expect(wrapper.text()).toContain('LMO-260827-0001'); expect(wrapper.get('.order-reference-text').attributes('title')).toBe('LMO-260827-0001') })
+  it('renders complete business references with single-line ellipsis and titles', async () => { routing.route.params = { orderId: '9007199254740999' }; const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [createPinia(), ElementPlus] } }); await flushPromises(); expect(getLastMileOrder).toHaveBeenCalledWith('9007199254740999'); expect(wrapper.text()).toContain('华远贸易'); expect(wrapper.text()).toContain('LMO-260827-0001'); expect(wrapper.get('.order-reference-text').attributes('title')).toBe('LMO-260827-0001'); const businessValues = wrapper.findAll('.detail-field-value--business'); expect(businessValues.map((item) => item.attributes('title'))).toEqual(expect.arrayContaining(['NYEXX2608280033', 'TSTU0000061'])); expect(businessValues.every((item) => item.text().length > 0)).toBe(true) })
 })
@@ -14,6 +14,8 @@ export interface LastMileOrderListItem {
  inboundCode: string
  lxCode: string
  owner: string
+  overseasWarehouseId: string
+  overseasWarehouseCode: string
  warehouse: string
  transferWarehouse: string
  fbaWarehouse: string
@@ -21,6 +23,11 @@ export interface LastMileOrderListItem {
  containerStatus: string
  abnormal: string
  held: string
+  detained: boolean
+  holdChargeable: boolean
+  holdReason: string
+  manualNodeOverride: boolean
+  version: number
  pallets: number | '—'
  cartons: number | '—'
  volume: number | '—'
@@ -53,6 +60,7 @@ export interface InboundOrderListItem {
  orderId: string
  warehouseId: string
  destinationWarehouseCode: string
+  destinationWarehouseName: string
  orderNo: string
  inboundCode: string
  lxCode: string