feat: add tail order controls and terminal drayage UI

src/modules/container-loading/api/terminalDrayages.test.ts

@@ -0,0 +1,56 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { http } from '@/shared/api/http'
+import {
+  getTerminalDrayageHistory,
+  listTerminalDrayages,
+  recordTerminalDrayageEmptyReturn,
+  recordTerminalDrayagePickup,
+  scheduleTerminalDrayagePickup,
+  selectTerminalDrayageFleet,
+} from './terminalDrayages'
+
+vi.mock('@/shared/api/http', () => ({
+  http: { get: vi.fn(), post: vi.fn() },
+  unwrapApiResponse: <T>(response: { data: T }) => response.data,
+}))
+
+const view = {
+  containerBookingId: '9007199254740993', containerNo: 'MSCU1234567', oceanBookingId: '9007199254740994',
+  status: 'UNLOADED', version: '3', fleetSupplierId: '9007199254740995', fleetSupplierName: '港运车队',
+  pickupAppointmentAt: '2026-09-07T08:00:00', actualPickupAt: '2026-09-07T09:00:00', estimatedEmptyReturnAt: '2026-09-10T10:00:00',
+  actualEmptyReturnAt: null, unloadingCompletedAt: '2026-09-07T10:00:00',
+  emptyReturnWarning: { status: 'OVERDUE', deadlineAt: '2026-09-10T10:00:00', overdueHours: '26', overdueDays: '1' },
+  allowedActions: ['SELECT_FLEET', 'RECORD_EMPTY_RETURN'], updatedAt: '2026-09-11T12:00:00',
+}
+
+describe('terminal drayages API', () => {
+  beforeEach(() => vi.clearAllMocks())
+
+  it('sends repeated container ids and preserves long identifiers as strings', async () => {
+    vi.mocked(http.get).mockResolvedValueOnce({ data: [view] })
+    const result = await listTerminalDrayages(['9007199254740993', '9007199254740994'])
+    const config = vi.mocked(http.get).mock.calls[0][1] as { params: URLSearchParams }
+    expect(config.params.getAll('containerBookingIds')).toEqual(['9007199254740993', '9007199254740994'])
+    expect(result[0]).toMatchObject({ containerBookingId: '9007199254740993', oceanBookingId: '9007199254740994', fleetSupplierId: '9007199254740995', version: 3 })
+    expect(result[0].emptyReturnWarning).toMatchObject({ overdueHours: 26, overdueDays: 1 })
+  })
+
+  it('uses frozen command paths, versions and idempotency keys', async () => {
+    vi.mocked(http.post).mockResolvedValue({ data: view })
+    await selectTerminalDrayageFleet('101', { expectedVersion: 3, fleetSupplierId: '501', fleetSupplierName: '港运车队' })
+    await scheduleTerminalDrayagePickup('101', { expectedVersion: 4, pickupAppointmentAt: '2026-09-07T08:00:00' })
+    await recordTerminalDrayagePickup('101', { expectedVersion: 5, actualAt: '2026-09-07T09:00:00' })
+    await recordTerminalDrayageEmptyReturn('101', { expectedVersion: 6, actualAt: '2026-09-10T09:00:00' })
+    expect(http.post).toHaveBeenNthCalledWith(1, '/platform/v1/terminal-drayages/101/fleet', expect.objectContaining({ expectedVersion: 3, fleetSupplierId: '501' }), expect.objectContaining({ headers: { 'Idempotency-Key': expect.stringContaining('terminal-drayage-fleet-') } }))
+    expect(http.post).toHaveBeenNthCalledWith(2, '/platform/v1/terminal-drayages/101/pickup-appointment', expect.objectContaining({ expectedVersion: 4 }), expect.any(Object))
+    expect(http.post).toHaveBeenNthCalledWith(3, '/platform/v1/terminal-drayages/101/pickup', expect.objectContaining({ expectedVersion: 5 }), expect.any(Object))
+    expect(http.post).toHaveBeenNthCalledWith(4, '/platform/v1/terminal-drayages/101/empty-return', expect.objectContaining({ expectedVersion: 6 }), expect.any(Object))
+  })
+
+  it('loads operation history from the container business id', async () => {
+    vi.mocked(http.get).mockResolvedValueOnce({ data: [{ action: 'SELECT_FLEET', fromStatus: 'ARRIVED', toStatus: 'ARRIVED', fromVersion: 0, toVersion: 1, reason: null, operatorId: '9007199254740993', operatorName: '平台管理员', createdAt: '2026-09-07T08:00:00' }] })
+    const result = await getTerminalDrayageHistory('101')
+    expect(http.get).toHaveBeenCalledWith('/platform/v1/terminal-drayages/101/history')
+    expect(result[0].operatorId).toBe('9007199254740993')
+  })
+})

src/modules/container-loading/api/terminalDrayages.ts

@@ -0,0 +1,101 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
+export type TerminalDrayageStatus = 'WAITING_FOR_ARRIVAL' | 'ARRIVED' | 'PICKUP_SCHEDULED' | 'PICKED_UP' | 'UNLOADED' | 'EMPTY_RETURNED'
+export type TerminalDrayageAction = 'SELECT_FLEET' | 'SCHEDULE_PICKUP' | 'RECORD_PICKUP' | 'RECORD_EMPTY_RETURN'
+export type EmptyReturnWarningStatus = 'NOT_APPLICABLE' | 'PENDING' | 'OVERDUE' | 'RESOLVED'
+
+export interface EmptyReturnWarning {
+  status: EmptyReturnWarningStatus
+  deadlineAt: string | null
+  overdueHours: number
+  overdueDays: number
+}
+
+export interface TerminalDrayageView {
+  containerBookingId: string
+  containerNo: string | null
+  oceanBookingId: string | null
+  status: TerminalDrayageStatus
+  version: number
+  fleetSupplierId: string | null
+  fleetSupplierName: string | null
+  pickupAppointmentAt: string | null
+  actualPickupAt: string | null
+  estimatedEmptyReturnAt: string | null
+  actualEmptyReturnAt: string | null
+  unloadingCompletedAt: string | null
+  emptyReturnWarning: EmptyReturnWarning
+  allowedActions: TerminalDrayageAction[]
+  updatedAt: string | null
+}
+
+export interface TerminalDrayageHistory {
+  action: TerminalDrayageAction
+  fromStatus: string
+  toStatus: string
+  fromVersion: number
+  toVersion: number
+  reason: string | null
+  operatorId: string
+  operatorName: string | null
+  createdAt: string
+}
+
+const path = '/platform/v1/terminal-drayages'
+function operationId(action: string) { return `terminal-drayage-${action}-${Date.now()}-${Math.random().toString(36).slice(2)}` }
+function id(value: unknown): string { return value == null ? '' : String(value) }
+function optionalId(value: unknown): string | null { return value == null ? null : String(value) }
+function normalize(raw: TerminalDrayageView): TerminalDrayageView {
+  return {
+    ...raw,
+    containerBookingId: id(raw.containerBookingId),
+    oceanBookingId: optionalId(raw.oceanBookingId),
+    fleetSupplierId: optionalId(raw.fleetSupplierId),
+    version: Number(raw.version || 0),
+    allowedActions: raw.allowedActions || [],
+    emptyReturnWarning: {
+      ...raw.emptyReturnWarning,
+      overdueHours: Number(raw.emptyReturnWarning?.overdueHours || 0),
+      overdueDays: Number(raw.emptyReturnWarning?.overdueDays || 0),
+    },
+  }
+}
+
+export async function listTerminalDrayages(containerBookingIds: string[]) {
+  const params = new URLSearchParams()
+  containerBookingIds.forEach((containerBookingId) => params.append('containerBookingIds', containerBookingId))
+  const response = await http.get<ApiEnvelope<TerminalDrayageView[]>, ApiEnvelope<TerminalDrayageView[]>>(path, { params })
+  return (unwrapApiResponse(response) || []).map(normalize)
+}
+
+export async function getTerminalDrayage(containerBookingId: string) {
+  const response = await http.get<ApiEnvelope<TerminalDrayageView>, ApiEnvelope<TerminalDrayageView>>(`${path}/${encodeURIComponent(containerBookingId)}`)
+  return normalize(unwrapApiResponse(response))
+}
+
+export async function getTerminalDrayageHistory(containerBookingId: string) {
+  const response = await http.get<ApiEnvelope<TerminalDrayageHistory[]>, ApiEnvelope<TerminalDrayageHistory[]>>(`${path}/${encodeURIComponent(containerBookingId)}/history`)
+  return (unwrapApiResponse(response) || []).map((item) => ({ ...item, operatorId: id(item.operatorId) }))
+}
+
+async function command(containerBookingId: string, action: string, body: object) {
+  const response = await http.post<ApiEnvelope<TerminalDrayageView>, ApiEnvelope<TerminalDrayageView>>(
+    `${path}/${encodeURIComponent(containerBookingId)}/${action}`,
+    body,
+    { headers: { 'Idempotency-Key': operationId(action) } },
+  )
+  return normalize(unwrapApiResponse(response))
+}
+
+export function selectTerminalDrayageFleet(containerBookingId: string, body: { expectedVersion: number; fleetSupplierId: string; fleetSupplierName?: string; reason?: string }) {
+  return command(containerBookingId, 'fleet', body)
+}
+export function scheduleTerminalDrayagePickup(containerBookingId: string, body: { expectedVersion: number; pickupAppointmentAt: string; reason?: string }) {
+  return command(containerBookingId, 'pickup-appointment', body)
+}
+export function recordTerminalDrayagePickup(containerBookingId: string, body: { expectedVersion: number; actualAt: string; reason?: string }) {
+  return command(containerBookingId, 'pickup', body)
+}
+export function recordTerminalDrayageEmptyReturn(containerBookingId: string, body: { expectedVersion: number; actualAt: string; reason?: string }) {
+  return command(containerBookingId, 'empty-return', body)
+}

src/modules/container-loading/pages/ContainersView.test.ts

@@ -11,6 +11,7 @@ import { listPlatformPartners } from '@/modules/master-data'
 import { listSuppliers } from '@/modules/suppliers'
 import { getOceanBooking, listOceanBookingLinkCandidates, listOceanBookings } from '@/modules/ocean-bookings'
 import { getContainer, getContainerOverview, linkContainerOceanBooking, listContainers, updateContainer } from '../api/platformContainerLoading'
+import { getTerminalDrayage, getTerminalDrayageHistory, listTerminalDrayages, recordTerminalDrayageEmptyReturn, selectTerminalDrayageFleet } from '../api/terminalDrayages'
 import AppDialog from '@/shared/components/AppDialog.vue'
 
 vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
@@ -21,6 +22,15 @@ vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn().mockResolvedValue
 const accessCan = vi.hoisted(() => vi.fn())
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: accessCan }) }))
 vi.mock('../api/platformContainerLoading', () => ({ listContainers: vi.fn(), getContainer: vi.fn(), getContainerOverview: vi.fn(), getContainerClearance: vi.fn(), uploadContainerClearance: vi.fn(), completeContainerClearance: vi.fn(), uploadContainerDocument: vi.fn(), downloadContainerDocument: vi.fn(), downloadContainerPdaPhoto: vi.fn(), markContainerException: vi.fn(), cancelContainerException: vi.fn(), createContainerSimulation: vi.fn(), linkContainerOceanBooking: vi.fn(), unlinkContainerOceanBooking: vi.fn(), updateContainer: vi.fn() }))
+vi.mock('../api/terminalDrayages', () => ({ listTerminalDrayages: vi.fn(), getTerminalDrayage: vi.fn(), getTerminalDrayageHistory: vi.fn(), selectTerminalDrayageFleet: vi.fn(), scheduleTerminalDrayagePickup: vi.fn(), recordTerminalDrayagePickup: vi.fn(), recordTerminalDrayageEmptyReturn: vi.fn() }))
+
+const drayage = {
+  containerBookingId: '9001', containerNo: 'MSCU-1', oceanBookingId: '101', status: 'UNLOADED' as const, version: 3,
+  fleetSupplierId: '501', fleetSupplierName: '港运车队', pickupAppointmentAt: '2026-09-07T08:00:00', actualPickupAt: '2026-09-07T09:00:00',
+  estimatedEmptyReturnAt: '2026-09-10T10:00:00', actualEmptyReturnAt: null, unloadingCompletedAt: '2026-09-07T10:00:00',
+  emptyReturnWarning: { status: 'OVERDUE' as const, deadlineAt: '2026-09-10T10:00:00', overdueHours: 26, overdueDays: 1 },
+  allowedActions: ['SELECT_FLEET', 'RECORD_EMPTY_RETURN'] as const, updatedAt: '2026-09-11T12:00:00',
+}
 
 function createTestRouter() {
   return createRouter({ history: createMemoryHistory(), routes: [
@@ -41,6 +51,11 @@ describe('ContainersView', () => {
     vi.mocked(listOceanBookings).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 1 })
     vi.mocked(listOceanBookingLinkCandidates).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
     vi.mocked(getOceanBooking).mockResolvedValue({} as never)
+    vi.mocked(listTerminalDrayages).mockResolvedValue([{ ...drayage, allowedActions: [...drayage.allowedActions] }])
+    vi.mocked(getTerminalDrayage).mockResolvedValue({ ...drayage, allowedActions: [...drayage.allowedActions] })
+    vi.mocked(getTerminalDrayageHistory).mockResolvedValue([])
+    vi.mocked(selectTerminalDrayageFleet).mockResolvedValue({ ...drayage, fleetSupplierId: '502', fleetSupplierName: '新车队', version: 4, allowedActions: [...drayage.allowedActions] })
+    vi.mocked(recordTerminalDrayageEmptyReturn).mockResolvedValue({ ...drayage, status: 'EMPTY_RETURNED', actualEmptyReturnAt: '2026-09-11T13:00:00', version: 4, emptyReturnWarning: { status: 'RESOLVED', deadlineAt: '2026-09-10T10:00:00', overdueHours: 0, overdueDays: 0 }, allowedActions: ['SELECT_FLEET'] })
     vi.mocked(listContainers).mockResolvedValue({ records: [{ id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelCode: 'ZBYHK', channelName: '美森正班海卡包税', containerType: '40HC', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 76, maxWeightKg: 28000, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null }], page: 1, size: 20, total: 1, pages: 1 })
     vi.mocked(getContainer).mockResolvedValue({ id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelCode: 'ZBYHK', channelName: '美森正班海卡包税', containerType: '40HC', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 76, maxWeightKg: 28000, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null })
     vi.mocked(getContainerOverview).mockResolvedValue({ container: { id: '9001', bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'WAIT_LOADING', warehouseId: '8', warehouseName: '义乌仓', voyageNo: null, vesselName: null, version: 0 }, loadingPlanId: null, pda: null, documents: [], exception: { active: false, reason: null, markedBy: null, markedByName: null, markedAt: null }, exceptionHistory: [], timeline: [] })
@@ -57,6 +72,9 @@ describe('ContainersView', () => {
     expect(wrapper.text()).toContain('MSCU-1')
     expect(wrapper.text()).toContain('宁波 → 长滩')
     expect(wrapper.find('button[aria-label="查看 CB-1"]').exists()).toBe(true)
+    expect(listTerminalDrayages).toHaveBeenCalledWith(['9001'])
+    expect(wrapper.text()).toContain('超时 1 天')
+    expect(wrapper.text()).toContain('2026-09-10 10:00')
   })
 
   it('keeps the cross-warehouse list usable when warehouse form options fail', async () => {
@@ -243,6 +261,46 @@ describe('ContainersView', () => {
     expect(source).toContain(':loading="loading" stripe preference-key="container-loading-table"')
   })
 
+  it('updates an ACTIVE TRUCKING fleet inline and records actual empty return once', async () => {
+    vi.mocked(listSuppliers).mockResolvedValue({ records: [{ id: '502', name: '新车队', category: 'TRUCKING', status: 'ACTIVE' } as never], page: 1, size: 200, total: 1, pages: 1 })
+    const router = createTestRouter()
+    await router.push('/'); await router.isReady()
+    const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+
+    const vm = wrapper.vm as unknown as {
+      rows: Array<Record<string, unknown>>
+      selectRowFleet: (row: Record<string, unknown>, supplierId: string) => Promise<void>
+      openDrayageAction: (row: Record<string, unknown>, action: 'RECORD_EMPTY_RETURN') => void
+      drayageActionAt: string
+      saveDrayageAction: () => Promise<void>
+    }
+    await vm.selectRowFleet(vm.rows[0], '502')
+    expect(selectTerminalDrayageFleet).toHaveBeenCalledWith('9001', { expectedVersion: 3, fleetSupplierId: '502', fleetSupplierName: '新车队' })
+
+    vm.openDrayageAction(vm.rows[0], 'RECORD_EMPTY_RETURN')
+    vm.drayageActionAt = '2026-09-11T13:00:00'
+    await vm.saveDrayageAction()
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledWith('9001', { expectedVersion: 4, actualAt: '2026-09-11T13:00:00', reason: undefined })
+    expect(wrapper.text()).toContain('已还柜')
+    wrapper.unmount()
+  })
+
+  it('loads terminal drayage detail and history only when requested', async () => {
+    vi.mocked(getTerminalDrayageHistory).mockResolvedValueOnce([{ action: 'SELECT_FLEET', fromStatus: 'ARRIVED', toStatus: 'ARRIVED', fromVersion: 0, toVersion: 1, reason: '到港安排', operatorId: '88', operatorName: '管理员', createdAt: '2026-09-07T08:00:00' }])
+    const router = createTestRouter()
+    await router.push('/'); await router.isReady()
+    const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+    const vm = wrapper.vm as unknown as { rows: Array<Record<string, unknown>>; openDrayageHistory: (row: Record<string, unknown>) => Promise<void> }
+    await vm.openDrayageHistory(vm.rows[0])
+    await flushPromises()
+    expect(getTerminalDrayage).toHaveBeenCalledWith('9001')
+    expect(getTerminalDrayageHistory).toHaveBeenCalledWith('9001')
+    expect(wrapper.text()).toContain('到港安排')
+    wrapper.unmount()
+  })
+
   it('opens the existing released-booking workflow when entered from container detail', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
     expect(source).toContain('route.query.linkContainerId')

src/modules/container-loading/pages/ContainersView.vue

@@ -19,6 +19,18 @@ import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/compone
 import { CONTAINER_SPECIFICATIONS, applyContainerSpecification, containerSpecification } from '@/shared/domain/containerSpecifications'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { createContainerSimulation, getContainer, linkContainerOceanBooking, listContainers, updateContainer } from '../api/platformContainerLoading'
+import {
+  getTerminalDrayage,
+  getTerminalDrayageHistory,
+  listTerminalDrayages,
+  recordTerminalDrayageEmptyReturn,
+  recordTerminalDrayagePickup,
+  scheduleTerminalDrayagePickup,
+  selectTerminalDrayageFleet,
+  type TerminalDrayageAction,
+  type TerminalDrayageHistory,
+  type TerminalDrayageView,
+} from '../api/terminalDrayages'
 import type { ContainerBookingResource, ContainerDocumentStatus, ContainerPlanStatus, ContainerSaveRequest, ContainerSimulationCreateRequest } from '../types'
 
 type Filters = QueryModel & { customerId: string; keyword: string; containerType: string; status: ContainerPlanStatus | ''; sailingRange: string[] }
@@ -68,9 +80,25 @@ const linkContainerNo = ref('')
 const linkCandidates = ref<Array<{ key: string; oceanBookingId: string; requirementId: string; label: string; disabled: boolean }>>([])
 const selectedTruckingSupplierId = ref('')
 const unresolvedTruckingSupplierName = ref<string | null>(null)
+const drayages = ref<Record<string, TerminalDrayageView>>({})
+const drayageLoading = ref(false)
+const drayageLoadError = ref<ApiErrorDetails | null>(null)
+const drayageSavingIds = ref<string[]>([])
+const drayageActionOpen = ref(false)
+const drayageAction = ref<Exclude<TerminalDrayageAction, 'SELECT_FLEET'>>('SCHEDULE_PICKUP')
+const drayageTarget = ref<ContainerBookingResource | null>(null)
+const drayageActionAt = ref('')
+const drayageReason = ref('')
+const drayageActionSaving = ref(false)
+const drayageActionError = ref<ApiErrorDetails | null>(null)
+const drayageHistoryOpen = ref(false)
+const drayageHistory = ref<TerminalDrayageHistory[]>([])
+const drayageHistoryLoading = ref(false)
+const drayageHistoryError = ref<ApiErrorDetails | null>(null)
 let listSequence = 0
 let detailSequence = 0
 let linkSequence = 0
+let drayageSequence = 0
 
 function emptyForm(): ContainerForm {
   return {
@@ -140,6 +168,7 @@ const queryFields = computed<QueryField[]>(() => [
 ])
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 310, fixed: 'left', slotName: 'actions' },
+  { key: 'emptyReturnWarning', label: '报空预警', width: 120, slotName: 'emptyReturnWarning' },
   { key: 'containerNo', label: '集装箱号', minWidth: 150, slotName: 'containerNo' },
   { key: 'planNo', prop: 'planNo', label: '装柜清单号', minWidth: 165, formatter: (row: ContainerBookingResource) => row.planNo || '—' },
   { key: 'planStatus', label: '状态', width: 110, slotName: 'status' },
@@ -150,7 +179,11 @@ const columns: DataTableColumn[] = [
   { key: 'pickupOrderDocumentStatus', label: 'PU资料', width: 100, formatter: (row: ContainerBookingResource) => documentStatusText(row.pickupOrderDocumentStatus) },
   { key: 'oceanBooking', label: '真实订舱', minWidth: 170, slotName: 'oceanBooking' },
   { key: 'warehouseName', prop: 'warehouseName', label: '装柜仓库', minWidth: 160 },
-  { key: 'terminalTruckingCompany', prop: 'terminalTruckingCompany', label: '码头车队', minWidth: 160 },
+  { key: 'terminalTruckingCompany', label: '码头车队', width: 190, slotName: 'terminalTruckingCompany' },
+  { key: 'pickupAppointmentAt', label: '预约提柜', width: 165, slotName: 'pickupAppointmentAt' },
+  { key: 'actualPickupAt', label: '实际提柜', width: 165, slotName: 'actualPickupAt' },
+  { key: 'estimatedEmptyReturnAt', label: '预计还柜', width: 165, slotName: 'estimatedEmptyReturnAt' },
+  { key: 'actualEmptyReturnAt', label: '实际还柜', width: 165, slotName: 'actualEmptyReturnAt' },
   { key: 'billOfLadingNo', prop: 'billOfLadingNo', label: '提单号', minWidth: 150 },
   { key: 'route', label: '航线', minWidth: 220, slotName: 'route' },
   { key: 'containerType', prop: 'containerType', label: '柜型', width: 100 },
@@ -163,12 +196,45 @@ const columns: DataTableColumn[] = [
   { key: 'estimatedPortArrivalAt', label: '预计到港', minWidth: 160, slotName: 'estimatedPortArrivalAt' },
   { key: 'actualPortArrivalAt', label: '实际到港', minWidth: 160, slotName: 'actualPortArrivalAt' },
 ]
+const drayageHistoryColumns: DataTableColumn[] = [
+  { key: 'action', label: '动作', width: 130, formatter: (row: TerminalDrayageHistory) => drayageActionText(row.action) },
+  { key: 'status', label: '状态变化', minWidth: 180, formatter: (row: TerminalDrayageHistory) => `${drayageStatusText(row.fromStatus)} → ${drayageStatusText(row.toStatus)}` },
+  { key: 'version', label: '版本', width: 100, formatter: (row: TerminalDrayageHistory) => `${row.fromVersion} → ${row.toVersion}` },
+  { key: 'operatorName', label: '操作人', width: 130, formatter: (row: TerminalDrayageHistory) => row.operatorName || '—' },
+  { key: 'createdAt', label: '操作时间', width: 170, formatter: (row: TerminalDrayageHistory) => formatTime(row.createdAt) },
+  { key: 'reason', label: '原因', minWidth: 200 },
+]
 
 function optional(value: string | null) { return value?.trim() || null }
 function normalizedContainerNo(value: string | null | undefined) { return String(value || '').trim().toUpperCase() }
 function statusText(status: ContainerPlanStatus) { return ({ WAIT_LOADING: '待装柜', EDITING: '预装柜中', LOADING: '拣货中', COMPLETED: '装柜完成' })[status] }
 function documentStatusText(status: ContainerDocumentStatus | null | undefined) { return status ? ({ MISSING: '未上传', UPLOADED: '已上传', COMPLETED: '已完成' })[status] : '—' }
 function formatTime(value: string | null | undefined) { return value?.replace('T', ' ').slice(0, 16) || '—' }
+function drayageFor(containerBookingId: string) { return drayages.value[containerBookingId] }
+function drayageStatusText(status?: string | null) { return ({ WAITING_FOR_ARRIVAL: '待到港', ARRIVED: '已到港', PICKUP_SCHEDULED: '已约提柜', PICKED_UP: '已提柜', UNLOADED: '已卸柜', EMPTY_RETURNED: '已还柜' } as Record<string, string>)[status || ''] || status || '—' }
+function drayageActionText(action: TerminalDrayageAction) { return ({ SELECT_FLEET: '选择码头车队', SCHEDULE_PICKUP: '预约提柜', RECORD_PICKUP: '确认实际提柜', RECORD_EMPTY_RETURN: '确认实际还柜' } as Record<TerminalDrayageAction, string>)[action] }
+function canDrayage(row: ContainerBookingResource, action: TerminalDrayageAction) { return Boolean(canEdit.value && drayageFor(row.id)?.allowedActions.includes(action)) }
+function drayageWarningText(row: ContainerBookingResource) {
+  const warning = drayageFor(row.id)?.emptyReturnWarning
+  if (!warning || warning.status === 'NOT_APPLICABLE') return '—'
+  if (warning.status === 'RESOLVED') return '已还柜'
+  if (warning.status === 'OVERDUE') return warning.overdueDays > 0 ? `超时 ${warning.overdueDays} 天` : `超时 ${warning.overdueHours} 小时`
+  return '待还柜'
+}
+function drayageWarningType(row: ContainerBookingResource) {
+  const status = drayageFor(row.id)?.emptyReturnWarning.status
+  return status === 'OVERDUE' ? 'danger' : status === 'RESOLVED' ? 'success' : status === 'PENDING' ? 'warning' : 'info'
+}
+function drayageWarningTitle(row: ContainerBookingResource) {
+  const warning = drayageFor(row.id)?.emptyReturnWarning
+  if (!warning) return ''
+  const deadline = warning.deadlineAt ? `还柜截止：${formatTime(warning.deadlineAt)}` : ''
+  return [drayageWarningText(row), deadline].filter(Boolean).join('；')
+}
+function localDateTimeValue() {
+  const now = new Date(Date.now() - new Date().getTimezoneOffset() * 60_000)
+  return now.toISOString().slice(0, 19)
+}
 function containerViewLabel(row: ContainerBookingResource) {
   const reference = [row.cabinetNo, row.containerNo, row.bookingNo]
     .find((value) => typeof value === 'string' && value.trim())
@@ -408,6 +474,81 @@ async function saveLink() {
   } catch (error) { linkError.value = getApiErrorDetails(error, '关联真实订舱柜失败') }
   finally { linkSaving.value = false }
 }
+function replaceDrayage(value: TerminalDrayageView) {
+  drayages.value = { ...drayages.value, [value.containerBookingId]: value }
+}
+async function loadDrayages(targetRows = rows.value) {
+  const sequence = ++drayageSequence
+  if (!targetRows.length) { drayages.value = {}; drayageLoadError.value = null; return }
+  drayageLoading.value = true; drayageLoadError.value = null
+  try {
+    const values = await listTerminalDrayages(targetRows.map((row) => row.id))
+    if (sequence !== drayageSequence) return
+    drayages.value = Object.fromEntries(values.map((value) => [value.containerBookingId, value]))
+  } catch (error) {
+    if (sequence !== drayageSequence) return
+    drayages.value = {}
+    drayageLoadError.value = getApiErrorDetails(error, '码头拖车信息加载失败，请重试')
+  } finally { if (sequence === drayageSequence) drayageLoading.value = false }
+}
+async function refreshDrayage(containerBookingId: string) {
+  const value = await getTerminalDrayage(containerBookingId)
+  replaceDrayage(value)
+  return value
+}
+async function selectRowFleet(source: object, supplierIdValue: unknown) {
+  const row = source as ContainerBookingResource
+  const current = drayageFor(row.id)
+  const supplier = truckingCompanies.value.find((item) => item.id === String(supplierIdValue || ''))
+  if (!current || !supplier || !canDrayage(row, 'SELECT_FLEET') || drayageSavingIds.value.includes(row.id)) return
+  drayageSavingIds.value = [...drayageSavingIds.value, row.id]
+  try {
+    replaceDrayage(await selectTerminalDrayageFleet(row.id, { expectedVersion: current.version, fleetSupplierId: supplier.id, fleetSupplierName: supplier.name }))
+    ElMessage.success('码头车队已更新')
+  } catch (error) {
+    const details = getApiErrorDetails(error, '码头车队更新失败')
+    if (details.code === 'A0409') {
+      try { await refreshDrayage(row.id) } catch { /* 保留原始冲突证据 */ }
+      ElMessage.warning('运输信息已被其他人修改，已刷新当前柜最新状态')
+    } else ElMessage.error(details.message)
+  } finally { drayageSavingIds.value = drayageSavingIds.value.filter((id) => id !== row.id) }
+}
+function openDrayageAction(row: ContainerBookingResource, action: Exclude<TerminalDrayageAction, 'SELECT_FLEET'>) {
+  if (!canDrayage(row, action)) return
+  drayageTarget.value = row; drayageAction.value = action; drayageActionAt.value = localDateTimeValue(); drayageReason.value = ''
+  drayageActionError.value = null; drayageActionOpen.value = true
+}
+async function saveDrayageAction() {
+  const row = drayageTarget.value
+  const current = row ? drayageFor(row.id) : null
+  if (!row || !current || !drayageActionAt.value || !canDrayage(row, drayageAction.value) || drayageActionSaving.value) return
+  drayageActionSaving.value = true; drayageActionError.value = null
+  try {
+    const reason = drayageReason.value.trim() || undefined
+    const next = drayageAction.value === 'SCHEDULE_PICKUP'
+      ? await scheduleTerminalDrayagePickup(row.id, { expectedVersion: current.version, pickupAppointmentAt: drayageActionAt.value, reason })
+      : drayageAction.value === 'RECORD_PICKUP'
+        ? await recordTerminalDrayagePickup(row.id, { expectedVersion: current.version, actualAt: drayageActionAt.value, reason })
+        : await recordTerminalDrayageEmptyReturn(row.id, { expectedVersion: current.version, actualAt: drayageActionAt.value, reason })
+    replaceDrayage(next); drayageActionOpen.value = false
+    ElMessage.success(`${drayageActionText(drayageAction.value)}成功`)
+  } catch (error) {
+    const details = getApiErrorDetails(error, `${drayageActionText(drayageAction.value)}失败`)
+    if (details.code === 'A0409') {
+      try { await refreshDrayage(row.id) } catch { /* 保留原始冲突证据 */ }
+      drayageActionError.value = { ...details, message: '运输信息已被其他人修改，已刷新最新状态；请重新确认后提交' }
+    } else drayageActionError.value = details
+  } finally { drayageActionSaving.value = false }
+}
+async function openDrayageHistory(row: ContainerBookingResource) {
+  drayageTarget.value = row; drayageHistory.value = []; drayageHistoryError.value = null; drayageHistoryOpen.value = true; drayageHistoryLoading.value = true
+  try {
+    const [current, history] = await Promise.all([getTerminalDrayage(row.id), getTerminalDrayageHistory(row.id)])
+    if (drayageTarget.value?.id !== row.id) return
+    replaceDrayage(current); drayageHistory.value = history
+  } catch (error) { if (drayageTarget.value?.id === row.id) drayageHistoryError.value = getApiErrorDetails(error, '码头拖车记录加载失败') }
+  finally { if (drayageTarget.value?.id === row.id) drayageHistoryLoading.value = false }
+}
 async function loadRows() {
   const sequence = ++listSequence
   loading.value = true; loadError.value = null
@@ -421,6 +562,7 @@ async function loadRows() {
     })
     if (sequence !== listSequence) return
     rows.value = result.records; total.value = result.total
+    await loadDrayages(result.records)
   } catch (error) {
     if (sequence !== listSequence) return
     rows.value = []; total.value = 0; loadError.value = getApiErrorDetails(error, '货柜列表加载失败，请稍后重试')
@@ -435,6 +577,8 @@ function handleMoreAction(command: string, source: object) {
   const row = source as ContainerBookingResource
   if (command === 'link') { void openLink(row); return }
   if (command === 'overview') { openDetail(row); return }
+  if (command === 'drayage-history') { void openDrayageHistory(row); return }
+  if (command.startsWith('drayage:')) { openDrayageAction(row, command.slice('drayage:'.length) as Exclude<TerminalDrayageAction, 'SELECT_FLEET'>); return }
   if (['exception', 'documents'].includes(command)) void router.push({ name: 'container-detail', params: { containerId: row.id }, query: { action: command } })
 }
 async function openEdit(source: object) {
@@ -534,12 +678,19 @@ onMounted(async () => {
         <LoadErrorState title="货柜列表加载失败" :message="loadError.message" :loading="loading" @retry="loadRows"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
       </template>
         <section v-if="!loadError" class="surface-panel table-panel">
+          <el-alert v-if="drayageLoadError" class="drayage-load-alert" type="warning" :closable="false" show-icon :title="drayageLoadError.message"><el-button link type="warning" :loading="drayageLoading" @click="loadDrayages()">重新加载码头拖车信息</el-button></el-alert>
           <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" stripe preference-key="container-loading-table" empty-text="暂无货柜">
             <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="openSimulation"><Plus :size="16" />新增模拟柜</el-button></template>
-            <template #actions="{ row }"><div class="row-actions"><el-button v-if="canView" size="small" type="primary" plain :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-button v-if="canView && canEdit && ['WAIT_LOADING', 'EDITING'].includes(row.planStatus)" size="small" @click="openEdit(row)"><Pencil :size="15" />编辑运输信息</el-button><el-button v-if="row.planStatus === 'EDITING' && canSmartLoading" size="small" type="primary" @click="goContainerProcess(row)"><Sparkles :size="15" />智能装柜</el-button><el-button v-else-if="row.planStatus === 'LOADING' && canViewPreload" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />预装清单</el-button><el-button v-else-if="row.planStatus === 'COMPLETED' && canViewLoadingList" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />装柜清单</el-button><el-dropdown v-if="canView" trigger="click" @command="handleMoreAction($event, row)"><el-button size="small" plain aria-label="更多货柜操作" title="更多货柜操作"><MoreHorizontal :size="16" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item command="overview"><FileText :size="15" />轨迹与日志</el-dropdown-item><el-dropdown-item command="documents"><FileUp :size="15" />DO / PU 资料</el-dropdown-item><el-dropdown-item v-if="canEdit && row.sourceType === 'SIMULATION' && !row.oceanBookingId && ['WAIT_LOADING','EDITING'].includes(row.planStatus)" command="link"><Link2 :size="15" />关联已放舱订舱</el-dropdown-item><el-dropdown-item v-if="canEdit" command="exception" divided><TriangleAlert :size="15" />异常处理</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
+            <template #actions="{ row }"><div class="row-actions"><el-button v-if="canView" size="small" type="primary" plain :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-button v-if="canView && canEdit && ['WAIT_LOADING', 'EDITING'].includes(row.planStatus)" size="small" @click="openEdit(row)"><Pencil :size="15" />编辑运输信息</el-button><el-button v-if="row.planStatus === 'EDITING' && canSmartLoading" size="small" type="primary" @click="goContainerProcess(row)"><Sparkles :size="15" />智能装柜</el-button><el-button v-else-if="row.planStatus === 'LOADING' && canViewPreload" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />预装清单</el-button><el-button v-else-if="row.planStatus === 'COMPLETED' && canViewLoadingList" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />装柜清单</el-button><el-dropdown v-if="canView" trigger="click" @command="handleMoreAction($event, row)"><el-button size="small" plain aria-label="更多货柜操作" title="更多货柜操作"><MoreHorizontal :size="16" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item command="overview"><FileText :size="15" />轨迹与日志</el-dropdown-item><el-dropdown-item command="drayage-history"><FileText :size="15" />码头拖车记录</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerBookingResource, 'SCHEDULE_PICKUP')" command="drayage:SCHEDULE_PICKUP">预约提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerBookingResource, 'RECORD_PICKUP')" command="drayage:RECORD_PICKUP">确认实际提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerBookingResource, 'RECORD_EMPTY_RETURN')" command="drayage:RECORD_EMPTY_RETURN">确认实际还柜</el-dropdown-item><el-dropdown-item command="documents"><FileUp :size="15" />DO / PU 资料</el-dropdown-item><el-dropdown-item v-if="canEdit && row.sourceType === 'SIMULATION' && !row.oceanBookingId && ['WAIT_LOADING','EDITING'].includes(row.planStatus)" command="link"><Link2 :size="15" />关联已放舱订舱</el-dropdown-item><el-dropdown-item v-if="canEdit" command="exception" divided><TriangleAlert :size="15" />异常处理</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
+            <template #emptyReturnWarning="{ row }"><el-tag :type="drayageWarningType(row as ContainerBookingResource)" effect="light" :title="drayageWarningTitle(row as ContainerBookingResource)">{{ drayageWarningText(row as ContainerBookingResource) }}</el-tag></template>
             <template #cabinet="{ row }"><strong>{{ row.cabinetNo }}</strong><small>系统生成</small></template>
             <template #oceanBooking="{ row }"><span v-if="row.oceanBookingId"><strong>{{ row.billOfLadingNo || '已关联订舱' }}</strong><small>{{ row.containerNo ? `集装箱号：${row.containerNo}` : '集装箱号：待补录' }}</small></span><span v-else>未关联</span></template>
             <template #containerNo="{ row }">{{ row.containerNo || '待补录' }}</template>
+            <template #terminalTruckingCompany="{ row }"><el-select class="fleet-select" :model-value="drayageFor(row.id)?.fleetSupplierId || ''" filterable placeholder="请选择车队" :loading="drayageSavingIds.includes(row.id)" :disabled="!canDrayage(row as ContainerBookingResource, 'SELECT_FLEET') || drayageSavingIds.includes(row.id)" @update:model-value="selectRowFleet(row, $event)"><el-option v-if="drayageFor(row.id)?.fleetSupplierName && !truckingCompanies.some((item) => item.id === drayageFor(row.id)?.fleetSupplierId)" :label="drayageFor(row.id)?.fleetSupplierName || '原码头车队'" :value="drayageFor(row.id)?.fleetSupplierId || ''" disabled /><el-option v-for="supplier in truckingCompanies" :key="supplier.id" :label="supplier.name" :value="supplier.id" /></el-select></template>
+            <template #pickupAppointmentAt="{ row }">{{ formatTime(drayageFor(row.id)?.pickupAppointmentAt) }}</template>
+            <template #actualPickupAt="{ row }">{{ formatTime(drayageFor(row.id)?.actualPickupAt) }}</template>
+            <template #estimatedEmptyReturnAt="{ row }">{{ formatTime(drayageFor(row.id)?.estimatedEmptyReturnAt) }}</template>
+            <template #actualEmptyReturnAt="{ row }">{{ formatTime(drayageFor(row.id)?.actualEmptyReturnAt) }}</template>
             <template #status="{ row }"><el-tag :type="row.planStatus === 'COMPLETED' ? 'success' : row.planStatus === 'LOADING' ? 'warning' : 'info'">{{ statusText(row.planStatus) }}</el-tag></template>
             <template #route="{ row }">{{ row.departurePortName || row.departurePortCode || '—' }} → {{ row.destinationPortName || row.destinationPortCode || '—' }}</template>
             <template #capacity="{ row }">{{ row.capacityCbm ? `${row.capacityCbm} m³` : '—' }} / {{ row.maxWeightKg ? `${row.maxWeightKg} kg` : '—' }}</template>
@@ -595,12 +746,22 @@ onMounted(async () => {
         <el-form-item label="预计到港时间"><el-date-picker v-model="form.estimatedPortArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计到港时间" /></el-form-item>
       </el-form>
     </AppDialog>
+
+    <AppDialog v-model="drayageActionOpen" :title="drayageActionText(drayageAction)" width="min(520px, calc(100vw - 28px))" :confirm-text="drayageActionText(drayageAction)" cancel-text="取消" :confirm-loading="drayageActionSaving" :confirm-disabled="!drayageActionAt" @confirm="saveDrayageAction">
+      <el-form label-position="top"><el-form-item :label="drayageAction === 'SCHEDULE_PICKUP' ? '预约提柜时间' : drayageAction === 'RECORD_PICKUP' ? '实际提柜时间' : '实际还柜时间'" required><el-date-picker v-model="drayageActionAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择时间" /></el-form-item><el-form-item label="原因/备注"><el-input v-model="drayageReason" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="选填" /></el-form-item></el-form>
+      <LoadErrorState v-if="drayageActionError" compact :title="`${drayageActionText(drayageAction)}失败`" :message="drayageActionError.message" :show-retry="false"><template #details><ApiErrorMeta :details="drayageActionError" /></template></LoadErrorState>
+    </AppDialog>
+
+    <AppDialog v-model="drayageHistoryOpen" title="码头拖车记录" width="min(980px, calc(100vw - 28px))" :show-footer="false">
+      <LoadErrorState v-if="drayageHistoryError" compact title="码头拖车记录加载失败" :message="drayageHistoryError.message" :loading="drayageHistoryLoading" @retry="drayageTarget && openDrayageHistory(drayageTarget)"><template #details><ApiErrorMeta :details="drayageHistoryError" /></template></LoadErrorState>
+      <template v-else><el-descriptions v-if="drayageTarget && drayageFor(drayageTarget.id)" :column="4" border class="drayage-summary"><el-descriptions-item label="当前状态">{{ drayageStatusText(drayageFor(drayageTarget.id)?.status) }}</el-descriptions-item><el-descriptions-item label="码头车队">{{ drayageFor(drayageTarget.id)?.fleetSupplierName || '—' }}</el-descriptions-item><el-descriptions-item label="预计还柜">{{ formatTime(drayageFor(drayageTarget.id)?.estimatedEmptyReturnAt) }}</el-descriptions-item><el-descriptions-item label="实际还柜">{{ formatTime(drayageFor(drayageTarget.id)?.actualEmptyReturnAt) }}</el-descriptions-item></el-descriptions><DataTable :data="drayageHistory" :columns="drayageHistoryColumns" :loading="drayageHistoryLoading" stripe column-settings-mode="hide" empty-text="暂无码头拖车操作记录" /></template>
+    </AppDialog>
     </section>
   </AdminPage>
 </template>
 
 <style scoped>
-.container-page { display: grid; gap: 16px; min-width: 0; }.container-page small { display: block; margin-top: 4px; color: var(--cc-muted); }.row-actions { display: flex; align-items: center; flex-wrap: wrap; gap: 4px; }.row-actions :deep(.el-button + .el-button) { margin-left: 0; }.form-grid { display: grid; grid-template-columns: minmax(0,1fr); gap: 0; }.form-grid :deep(.el-select),.form-grid :deep(.el-date-editor),.form-grid :deep(.el-input-number),.simulation-form :deep(.el-select),.simulation-form :deep(.el-input-number) { width: 100%; }.details :deep(.el-descriptions__label) { width: 120px; }.dialog-hint { margin: 4px 0 0; color: var(--cc-muted); font-size: 12px; line-height: 1.6; }
+.container-page { display: grid; gap: 16px; min-width: 0; }.container-page small { display: block; margin-top: 4px; color: var(--cc-muted); }.row-actions { display: flex; align-items: center; flex-wrap: nowrap; gap: 4px; white-space: nowrap; }.row-actions :deep(.el-button + .el-button) { margin-left: 0; }.form-grid { display: grid; grid-template-columns: minmax(0,1fr); gap: 0; }.form-grid :deep(.el-select),.form-grid :deep(.el-date-editor),.form-grid :deep(.el-input-number),.simulation-form :deep(.el-select),.simulation-form :deep(.el-input-number),.fleet-select { width: 100%; }.details :deep(.el-descriptions__label) { width: 120px; }.dialog-hint { margin: 4px 0 0; color: var(--cc-muted); font-size: 12px; line-height: 1.6; }.drayage-load-alert { margin-bottom: 12px; }.drayage-summary { margin-bottom: 14px; }
 :global(.container-editor-dialog.el-dialog) { display: flex; width: min(820px, calc(100vw - 28px)) !important; max-height: 90vh; margin-block: 5vh !important; overflow: hidden; flex-direction: column; border-radius: 12px; }
 :global(.container-editor-dialog .el-dialog__header) { flex: 0 0 auto; margin: 0; padding: 20px 28px; border-bottom: 1px solid #e5eaf1; }
 :global(.container-editor-dialog .el-dialog__title) { color: #1e293b; font-size: 18px; font-weight: 700; }

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

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { overseasHttp } from '@/shared/api/overseasHttp'
-import { changeContainerReceivingWarehouse, 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,29 @@ 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,
+      plannedWarehouseId: '193000000000200003', plannedWarehouseCode: 'US-LAX-01', plannedWarehouseName: '洛杉矶仓',
+      plannedArrivalDate: '2026-09-08', inboundCode: 'NYEXX2609060063', 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' } })
+  })
+
+  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 () => {

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

@@ -61,6 +61,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 +160,6 @@ export interface TransferDestinationPayload {
   remark?: string
 }
 
-export interface ConvertInboundPlanPayload {
-  orderId: string
-  customerId: string
-}
-
 export interface ContainerPlanProgressQuery {
   page: number
   size: number
@@ -210,6 +210,60 @@ 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
+  plannedWarehouseId: string
+  plannedWarehouseCode: string
+  plannedWarehouseName: string
+  plannedArrivalDate: string
+  inboundCode: 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
@@ -218,6 +272,7 @@ export interface ChangeContainerReceivingWarehousePayload {
 
 export interface LastMileOrderDetailDto {
   order: LastMileOrderDto
+  manualNodes?: ManualNodesResponse['nodes']
   cargo: LastMileCargoDto[]
   statusHistory: LastMileStatusHistoryDto[]
   fees: LastMileFeeDto[]
@@ -276,13 +331,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',
@@ -298,6 +346,43 @@ 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,

src/modules/overseas-warehouse/lastMilePresentation.ts

@@ -113,6 +113,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),

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

@@ -8,7 +8,7 @@ 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': 110,
+      'LastMileOrdersView.vue': 178,
       'InboundOrdersView.vue': 260,
       'DispatchesView.vue': 270,
       'OutboundsView.vue': 180,

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

@@ -11,12 +11,15 @@ 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'
 
@@ -26,7 +29,8 @@ vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
 vi.mock('../api/lastMileOrders', () => ({
   listLastMileOrders: vi.fn(), listContainerPlanProgress: vi.fn(), getContainerPlanProgress: vi.fn(),
   changeContainerReceivingWarehouse: vi.fn(),
-  convertLastMileOrderToInboundPlan: vi.fn(), convertLastMileContainerToInboundPlans: vi.fn(), transferLastMileOrders: vi.fn(),
+  createManualInboundPlan: vi.fn(), convertLastMileContainerToInboundPlans: vi.fn(), transferLastMileOrders: vi.fn(),
+  getLastMileOrderManualNodes: vi.fn(), updateLastMileOrderHold: vi.fn(), updateLastMileOrderManualNodes: vi.fn(),
   downloadLastMileOrders: vi.fn(),
 }))
 
@@ -121,7 +125,10 @@ 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)
@@ -180,13 +187,15 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     expect(wrapper.text()).not.toContain('尾程订单加载失败')
   })
 
-  it('keeps single-order conversion isolated with long order and customer ids', async () => {
+  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('托盘类型')
+    expect(createManualInboundPlan).not.toHaveBeenCalled()
     expect(convertLastMileContainerToInboundPlans).not.toHaveBeenCalled()
     expect(listContainerPlanProgress).not.toHaveBeenCalled()
   })
@@ -211,7 +220,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)
   })
@@ -435,7 +444,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     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: 110, fixed: 'left'")
+    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 () => {

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

@@ -13,7 +13,7 @@ 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 { changeContainerReceivingWarehouse, 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'
@@ -40,6 +40,27 @@ 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 inboundPlanWarehouseLoading = ref(false)
+const inboundPlanWarehouses = ref<TransferWarehouseOption[]>([])
+const inboundPlanForm = reactive({ warehouseId: '', 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)
@@ -136,7 +157,7 @@ function newReceivingWarehouseIdempotencyKey() {
   return `container-receiving-warehouse-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`
 }
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 110, 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 },
@@ -412,26 +433,94 @@ 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)}`
+}
+async function loadInboundPlanWarehouses() {
+  inboundPlanWarehouseLoading.value = true
+  try {
+    inboundPlanWarehouses.value = (await listAllPlatformWarehouses({ warehouseType: 'OVERSEAS', status: 'ACTIVE' })).map(toTransferWarehouseOption)
+    const targetWarehouse = inboundPlanWarehouses.value.find((item) => actionTarget.value?.warehouse.includes(item.warehouseName))
+    if (targetWarehouse) inboundPlanForm.warehouseId = targetWarehouse.warehouseId
+  } catch (error) {
+    actionError.value = getApiErrorDetails(error, '入库仓候选加载失败，请重试')
+  } finally {
+    inboundPlanWarehouseLoading.value = false
+  }
+}
+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, { warehouseId: '', 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: '' })
+  inboundPlanWarehouses.value = []
+  actionError.value = null
+  inboundPlanOpen.value = true
+  void loadInboundPlanWarehouses()
+}
+async function submitInboundPlan() {
+  const row = actionTarget.value
+  const warehouse = inboundPlanWarehouses.value.find((item) => item.warehouseId === inboundPlanForm.warehouseId)
+  if (!row || !warehouse || !inboundPlanForm.plannedArrivalDate || !inboundPlanForm.inboundCode.trim() || 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,
+      plannedWarehouseId: warehouse.warehouseId, plannedWarehouseCode: warehouse.warehouseCode,
+      plannedWarehouseName: warehouse.warehouseName, plannedArrivalDate: inboundPlanForm.plannedArrivalDate,
+      inboundCode: inboundPlanForm.inboundCode.trim(), 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
@@ -552,8 +641,8 @@ onMounted(() => { void load() })
       </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>
@@ -626,10 +715,37 @@ onMounted(() => { void load() })
       </LoadErrorState>
     </el-form>
   </AppDialog>
+  <AppDialog v-model="inboundPlanOpen" title="入库计划" width="min(720px, calc(100vw - 28px))" confirm-text="保存并生成入库单" :loading="inboundPlanWarehouseLoading" :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="计划入库仓" required><el-select v-model="inboundPlanForm.warehouseId" filterable placeholder="请选择海外仓"><el-option v-for="warehouse in inboundPlanWarehouses" :key="warehouse.warehouseId" :label="warehouse.label" :value="warehouse.warehouseId" /></el-select></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="入仓码" required><el-input v-model="inboundPlanForm.inboundCode" maxlength="128" 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; }

src/modules/overseas-warehouse/types.ts

@@ -21,6 +21,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 | '—'