From 0b676ddb741c7f1736527f54fd6dd74377af38d1 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 1 Sep 2026 15:24:37 +0800
Subject: [PATCH] feat(admin): allow late container number entry

---
 .../pages/ContainerDetailView.vue             |  2 +-
 .../pages/ContainersView.test.ts              | 34 +++++++++++++++++--
 .../pages/ContainersView.vue                  | 20 +++++------
 .../pages/GlobalSmartLoadingView.test.ts      |  2 +-
 .../pages/GlobalSmartLoadingView.vue          |  2 +-
 .../pages/SmartLoadingWorkbenchView.vue       |  2 +-
 src/modules/container-loading/types.ts        |  2 +-
 .../loading-lists/api/platformLoadingLists.ts |  1 -
 .../components/LoadingListDetailDrawer.vue    |  7 ++--
 .../components/LoadingListsView.test.ts       |  4 +--
 .../pages/PreloadPlanDetailView.test.ts       | 18 +++++-----
 .../pages/PreloadPlanDetailView.vue           | 25 ++++++++------
 src/modules/ocean-bookings/types.ts           |  2 +-
 .../trucking/api/platformTrucking.test.ts     | 15 +++++++-
 src/modules/trucking/api/platformTrucking.ts  | 11 ++++--
 .../TruckAppointmentForm.behavior.test.ts     |  6 ++--
 .../components/TruckAppointmentForm.test.ts   | 18 +++++-----
 .../components/TruckAppointmentForm.vue       | 14 ++++----
 .../pages/TruckAppointmentDetailView.test.ts  | 14 ++++++--
 .../pages/TruckAppointmentDetailView.vue      | 18 ++++++++--
 .../pages/TruckAppointmentsView.test.ts       |  1 +
 .../trucking/pages/TruckAppointmentsView.vue  |  2 +-
 src/modules/trucking/types.ts                 |  6 ++++
 23 files changed, 155 insertions(+), 71 deletions(-)

diff --git a/src/modules/container-loading/pages/ContainerDetailView.vue b/src/modules/container-loading/pages/ContainerDetailView.vue
index 329a672c..61ed3153 100644
--- a/src/modules/container-loading/pages/ContainerDetailView.vue
+++ b/src/modules/container-loading/pages/ContainerDetailView.vue
@@ -363,7 +363,7 @@ onMounted(async () => { await load(); if (route.query.action === 'documents') op
   <AdminPage class="container-detail-page">
     <section class="container-overview surface-panel">
       <header class="container-overview__header"><el-button link type="primary" @click="router.push({ name: 'container-loading' })"><ArrowLeft :size="16" />返回列表</el-button><div><h1>{{ title }}</h1><p>柜次资料、履约轨迹、PDA 进度与单证</p></div><StatusBadge v-if="detail" :status="statusText(detail.planStatus)" /></header>
-      <div v-if="detail" class="container-overview__summary"><div><span>柜次号</span><strong>{{ detail.cabinetNo || '—' }}</strong></div><div><span>集装箱号</span><strong>{{ detail.containerNo || '待录入' }}</strong></div><div><span>装柜清单号</span><strong>{{ detail.planNo || '—' }}</strong></div><div><span>柜型</span><strong>{{ detail.containerType || '—' }}</strong></div><div><span>装柜仓库</span><strong>{{ detail.warehouseName || '—' }}</strong></div></div>
+      <div v-if="detail" class="container-overview__summary"><div><span>柜次号</span><strong>{{ detail.cabinetNo || '—' }}</strong></div><div><span>集装箱号</span><strong>{{ detail.containerNo || '待补录' }}</strong></div><div><span>装柜清单号</span><strong>{{ detail.planNo || '—' }}</strong></div><div><span>柜型</span><strong>{{ detail.containerType || '—' }}</strong></div><div><span>装柜仓库</span><strong>{{ detail.warehouseName || '—' }}</strong></div></div>
     </section>
     <LoadErrorState v-if="error" title="货柜详情加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <template v-else-if="detail">
diff --git a/src/modules/container-loading/pages/ContainersView.test.ts b/src/modules/container-loading/pages/ContainersView.test.ts
index ae687357..b0666730 100644
--- a/src/modules/container-loading/pages/ContainersView.test.ts
+++ b/src/modules/container-loading/pages/ContainersView.test.ts
@@ -233,7 +233,7 @@ describe('ContainersView', () => {
     expect(source).toContain('size="small" type="primary" plain :aria-label="containerViewLabel')
     expect(source).toContain("['WAIT_LOADING', 'EDITING'].includes(row.planStatus)")
     expect(source).not.toContain("row.containerNo ? '修改集装箱号' : '录入集装箱号'")
-    expect(source).toContain('初次录入请使用“关联已放舱订舱”；后续纠错请进入预装清单。')
+    expect(source).toContain('货柜基础资料不提供柜号写入')
     expect(source).toContain('containerNo: optional(detail.value?.containerNo || null)')
     expect(source).not.toContain('containerNo: optional(form.containerNo)')
     expect(source).not.toContain('updateContainerTransport')
@@ -251,7 +251,7 @@ describe('ContainersView', () => {
     expect(source).toContain("void router.replace({ name: 'container-loading' })")
   })
 
-  it('normalizes the mandatory booking-link container number and keeps it as the only initial-entry write', async () => {
+  it('normalizes an optional booking-link container number', async () => {
     vi.mocked(linkContainerOceanBooking).mockResolvedValue({} as never)
     const router = createTestRouter()
     await router.push('/'); await router.isReady()
@@ -278,6 +278,36 @@ describe('ContainersView', () => {
     wrapper.unmount()
   })
 
+  it('links a released booking while leaving the real container number pending until pickup', async () => {
+    vi.mocked(linkContainerOceanBooking).mockResolvedValue({} as never)
+    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 {
+      linkTarget: { id: string; version: number }
+      linkCandidates: Array<{ key: string; oceanBookingId: string; requirementId: string; disabled: boolean }>
+      linkCandidateKey: string
+      linkContainerNo: string
+      saveLink: () => Promise<void>
+    }
+    vm.linkTarget = { id: '9001', version: 7 }
+    vm.linkCandidates = [{ key: '101:202', oceanBookingId: '101', requirementId: '202', disabled: false }]
+    vm.linkCandidateKey = '101:202'
+    vm.linkContainerNo = ''
+
+    await vm.saveLink()
+
+    expect(linkContainerOceanBooking).toHaveBeenCalledWith('9001', {
+      oceanBookingId: '101', requirementId: '202', containerNo: null, expectedVersion: 7,
+    })
+    const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
+    expect(source).toContain('真实集装箱号可待司机提柜时录入')
+    expect(source).toContain(':confirm-disabled="!linkCandidateKey"')
+    expect(source).toContain("row.containerNo || '待补录'")
+    wrapper.unmount()
+  })
+
   it('keeps document uploads on the routed detail page without duplicate list implementations', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
     const detailSource = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainerDetailView.vue'), 'utf8')
diff --git a/src/modules/container-loading/pages/ContainersView.vue b/src/modules/container-loading/pages/ContainersView.vue
index 30974f17..d363b1ca 100644
--- a/src/modules/container-loading/pages/ContainersView.vue
+++ b/src/modules/container-loading/pages/ContainersView.vue
@@ -394,16 +394,16 @@ async function openLink(source: object) {
 async function saveLink() {
   const target = linkTarget.value
   const candidate = linkCandidates.value.find((item) => item.key === linkCandidateKey.value)
-  const containerNo = normalizedContainerNo(linkContainerNo.value)
-  linkContainerNo.value = containerNo
+  const normalized = normalizedContainerNo(linkContainerNo.value)
+  const containerNo = normalized || null
+  linkContainerNo.value = normalized
   if (!target || !candidate || candidate.disabled) { linkError.value = { message: '请选择规格一致且仍有剩余数量的柜型需求' }; return }
-  if (!containerNo) { linkError.value = { message: '请输入港口取得的真实集装箱号' }; return }
   linkSaving.value = true
   linkError.value = null
   try {
     await linkContainerOceanBooking(target.id, { oceanBookingId: candidate.oceanBookingId, requirementId: candidate.requirementId, containerNo, expectedVersion: target.version })
     linkOpen.value = false
-    ElMessage.success('订舱与真实集装箱号已关联，柜次号、装柜计划和明细保持不变')
+    ElMessage.success(containerNo ? '订舱与真实集装箱号已关联，柜次号、装柜计划和明细保持不变' : '订舱已关联，真实集装箱号待司机提柜时录入')
     await loadRows()
   } catch (error) { linkError.value = getApiErrorDetails(error, '关联真实订舱柜失败') }
   finally { linkSaving.value = false }
@@ -538,8 +538,8 @@ onMounted(async () => {
             <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 #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 #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 #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>
@@ -564,9 +564,9 @@ onMounted(async () => {
       <LoadErrorState v-if="simulationError" compact title="模拟柜创建失败" :message="simulationError.message" :show-retry="false"><template #details><ApiErrorMeta :details="simulationError" /></template></LoadErrorState>
     </AppDialog>
 
-    <AppDialog v-model="linkOpen" title="关联已放舱订舱" width="min(680px, calc(100vw - 28px))" confirm-text="确认关联" cancel-text="取消" :confirm-loading="linkSaving" :confirm-disabled="!linkCandidateKey || !linkContainerNo.trim()" @confirm="saveLink">
-      <el-alert title="关联后保留当前柜次号、装柜计划和明细，仅补充订舱快照及港口取得的真实集装箱号。" type="info" :closable="false" />
-      <el-form label-position="top"><el-form-item label="柜次号"><el-input :model-value="linkTarget?.cabinetNo || ''" disabled /></el-form-item><el-form-item label="已放舱订舱及柜型需求" required><el-select v-model="linkCandidateKey" filterable :loading="linkLoading" placeholder="请选择仍有剩余数量的柜型需求" no-data-text="暂无符合当前装柜仓库、物流渠道和柜型的已放舱需求"><el-option v-for="candidate in linkCandidates" :key="candidate.key" :label="candidate.label" :value="candidate.key" :disabled="candidate.disabled" /></el-select></el-form-item><el-form-item label="真实集装箱号" required><el-input v-model="linkContainerNo" maxlength="64" placeholder="请输入港口取得的真实集装箱号" @blur="linkContainerNo = normalizedContainerNo(linkContainerNo)" /></el-form-item></el-form>
+    <AppDialog v-model="linkOpen" title="关联已放舱订舱" width="min(680px, calc(100vw - 28px))" confirm-text="确认关联" cancel-text="取消" :confirm-loading="linkSaving" :confirm-disabled="!linkCandidateKey" @confirm="saveLink">
+      <el-alert title="关联后保留当前柜次号、装柜计划和明细，并补充订舱快照；真实集装箱号可待司机提柜时录入。" type="info" :closable="false" />
+      <el-form label-position="top"><el-form-item label="柜次号"><el-input :model-value="linkTarget?.cabinetNo || ''" disabled /></el-form-item><el-form-item label="已放舱订舱及柜型需求" required><el-select v-model="linkCandidateKey" filterable :loading="linkLoading" placeholder="请选择仍有剩余数量的柜型需求" no-data-text="暂无符合当前装柜仓库、物流渠道和柜型的已放舱需求"><el-option v-for="candidate in linkCandidates" :key="candidate.key" :label="candidate.label" :value="candidate.key" :disabled="candidate.disabled" /></el-select></el-form-item><el-form-item label="真实集装箱号（可选）"><el-input v-model="linkContainerNo" maxlength="64" placeholder="如未取得可留空，后续显示待补录" @blur="linkContainerNo = normalizedContainerNo(linkContainerNo)" /></el-form-item></el-form>
       <p class="dialog-hint">仓库、渠道和柜型必须与当前模拟柜一致；容量和限重仅展示柜型固定快照，不影响关联资格。</p>
       <LoadErrorState v-if="linkError" compact title="关联失败" :message="linkError.message" :show-retry="false"><template #details><ApiErrorMeta :details="linkError" /></template></LoadErrorState>
     </AppDialog>
@@ -576,7 +576,7 @@ onMounted(async () => {
       <LoadErrorState v-if="warehouseError" title="装柜仓库加载失败" :message="warehouseError.message" compact @retry="loadWarehouses"><template #details><ApiErrorMeta :details="warehouseError" /></template></LoadErrorState>
       <el-alert v-if="businessOptionsError" type="warning" :closable="false" show-icon :title="businessOptionsError"><el-button link type="warning" :loading="businessOptionsLoading" @click="loadBusinessOptions">重新加载业务选项</el-button></el-alert>
       <el-form v-if="!warehouseError" ref="formRef" :model="form" :rules="rules" label-position="top" class="form-grid">
-        <el-form-item label="真实集装箱号"><el-input :model-value="form.containerNo || '待录入'" disabled /><small>初次录入请使用“关联已放舱订舱”；后续纠错请进入预装清单。</small></el-form-item>
+        <el-form-item label="真实集装箱号"><el-input :model-value="form.containerNo || '待补录'" disabled /><small>货柜基础资料不提供柜号写入；请在拖车提柜或预装详情中补录，后续纠错也在预装详情完成。</small></el-form-item>
         <el-form-item label="柜次号"><el-input :model-value="form.cabinetNo" disabled placeholder="系统生成" /></el-form-item>
         <el-form-item label="装柜仓库" prop="warehouseId"><el-select v-model="form.warehouseId" filterable placeholder="请选择装柜仓库" :loading="warehouseLoading" loading-text="仓库加载中" no-data-text="暂无可用国内仓库"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :label="`${warehouse.warehouseName}（${warehouse.warehouseCode}）`" :value="String(warehouse.id)" /></el-select></el-form-item>
         <el-form-item label="提单号"><el-input v-model="form.billOfLadingNo" maxlength="128" placeholder="请输入提单号（可选）" /></el-form-item>
diff --git a/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts b/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts
index d104e424..970d918c 100644
--- a/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts
+++ b/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts
@@ -146,7 +146,7 @@ describe('GlobalSmartLoadingView', () => {
     const option = wrapper.find('.container-option')
     expect(option.text()).toContain('模拟柜次')
     expect(option.text()).toContain('柜次号：待生成')
-    expect(option.text()).toContain('集装箱号：待录入')
+    expect(option.text()).toContain('集装箱号：待补录')
     expect(option.text()).not.toContain('开始装柜前录入集装箱号')
     expect(option.text()).toContain('渠道：美森正班海卡包税')
     expect(option.text()).toContain('仓库：义乌国内仓')
diff --git a/src/modules/container-loading/pages/GlobalSmartLoadingView.vue b/src/modules/container-loading/pages/GlobalSmartLoadingView.vue
index 098faa04..e11f22f7 100644
--- a/src/modules/container-loading/pages/GlobalSmartLoadingView.vue
+++ b/src/modules/container-loading/pages/GlobalSmartLoadingView.vue
@@ -245,7 +245,7 @@ function hasRealContainerNo(container: ContainerBookingResource | null | undefin
   return Boolean(value) && !/^(?:MAN|SPLIT)-/i.test(value)
 }
 function displayActualContainerNo(container: ContainerBookingResource | null | undefined) {
-  return hasRealContainerNo(container) ? String(container?.containerNo || '').trim() : '待录入'
+  return hasRealContainerNo(container) ? String(container?.containerNo || '').trim() : '待补录'
 }
 function syncDrafts(next: SmartLoadingPlan, preserved: Record<string, number> = {}) {
   for (const key of Object.keys(quantityDrafts)) delete quantityDrafts[key]
diff --git a/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue b/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
index af377aab..d4ec1dda 100644
--- a/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
+++ b/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
@@ -180,7 +180,7 @@ function displayCabinetNo(value: ContainerBookingResource | null | undefined) {
 }
 function displayContainerNo(value: ContainerBookingResource | null | undefined) {
   const containerNo = String(value?.containerNo || '').trim()
-  return containerNo && !/^(?:MAN|SPLIT)-/i.test(containerNo) ? containerNo : '待录入'
+  return containerNo && !/^(?:MAN|SPLIT)-/i.test(containerNo) ? containerNo : '待补录'
 }
 function syncDrafts(preserved: Record<string, number> = {}) {
   for (const key of Object.keys(quantityDrafts)) delete quantityDrafts[key]
diff --git a/src/modules/container-loading/types.ts b/src/modules/container-loading/types.ts
index 0b204ec7..b027816e 100644
--- a/src/modules/container-loading/types.ts
+++ b/src/modules/container-loading/types.ts
@@ -69,7 +69,7 @@ export interface ContainerSimulationCreateRequest {
 export interface ContainerOceanBookingLinkRequest {
   oceanBookingId: string
   requirementId: string
-  containerNo: string
+  containerNo: string | null
   expectedVersion: number
 }
 
diff --git a/src/modules/loading-lists/api/platformLoadingLists.ts b/src/modules/loading-lists/api/platformLoadingLists.ts
index 0042d0e7..65ebbb59 100644
--- a/src/modules/loading-lists/api/platformLoadingLists.ts
+++ b/src/modules/loading-lists/api/platformLoadingLists.ts
@@ -11,7 +11,6 @@ export type PreloadConfirmationStatus = 'PENDING' | 'PARTIALLY_CONFIRMED' | 'CON
 export type PreloadBlockingReason =
   | 'PRELOAD_NOT_PUSHED'
   | 'LOADING_PLAN_NOT_EDITING'
-  | 'CONTAINER_NO_MISSING'
   | 'PRELOAD_LINK_MISSING'
   | 'OCEAN_BOOKING_NOT_LINKED'
   | 'OCEAN_BOOKING_NOT_RELEASED'
diff --git a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
index 1686e14d..d1d0b376 100644
--- a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
+++ b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
@@ -29,7 +29,7 @@ const baseItemColumns: DataTableColumn[] = [
   { key: 'sequence', prop: 'loadSequence', label: '装柜顺序', width: 92 },
   { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 170, className: 'identifier-column', showOverflowTooltip: true },
   { key: 'orderNo', prop: 'orderNo', label: '订单号', minWidth: 170, className: 'identifier-column', showOverflowTooltip: true },
-  { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 165, className: 'identifier-column', showOverflowTooltip: true, formatter: (row: LoadingItem) => row.containerNo || '—' },
+  { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 165, className: 'identifier-column', showOverflowTooltip: true, formatter: (row: LoadingItem) => row.containerNo || '待补录' },
   { key: 'skuCode', prop: 'skuCode', label: 'SKU', minWidth: 150, className: 'identifier-column', showOverflowTooltip: true },
   { key: 'destinationWarehouse', prop: 'destinationWarehouse', label: '目的仓', minWidth: 150, className: 'identifier-column', showOverflowTooltip: true },
   { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150 },
@@ -97,7 +97,6 @@ const visibleHistories = computed(() => {
 const blockingReasonLabels: Record<string, string> = {
   PRELOAD_NOT_PUSHED: '尚未推送预装清单',
   LOADING_PLAN_NOT_EDITING: '装柜计划已不在可确认的编辑状态',
-  CONTAINER_NO_MISSING: '尚未录入集装箱号',
   PRELOAD_LINK_MISSING: '装柜明细尚未完整关联入库预装票据',
   OCEAN_BOOKING_NOT_LINKED: '尚未关联真实订舱',
   OCEAN_BOOKING_NOT_RELEASED: '关联订舱尚未放舱',
@@ -165,14 +164,14 @@ function formatNumber(value?: number | null, digits = 3) {
         </div>
         <div v-if="detail && summary" class="detail-page-header__actions">
           <template v-if="canEditItemRemark">
-            <el-button v-if="canEditTransport" @click="emit('edit')"><Pencil :size="16" />纠正集装箱号 / 航次</el-button>
+            <el-button v-if="canEditTransport" @click="emit('edit')"><Pencil :size="16" />{{ summary.containerNo ? '纠正集装箱号 / 航次' : '补录集装箱号 / 航次' }}</el-button>
             <el-button type="primary" :loading="confirmSaving" :disabled="!preloadSummary?.readiness.canConfirm" @click="emit('confirmPreload')"><Check :size="16" />确认预装</el-button>
           </template>
         </div>
       </header>
       <section v-if="detail && summary" class="detail-summary" aria-label="清单基本信息">
         <div><span>柜次号</span><strong>{{ summary.cabinetNo || '—' }}</strong></div>
-        <div><span>集装箱号</span><strong>{{ summary.containerNo || '待录入' }}</strong></div>
+        <div><span>集装箱号</span><strong>{{ summary.containerNo || '待补录' }}</strong></div>
         <div><span>仓库</span><strong>{{ summary.warehouseName || '—' }}</strong></div>
         <div><span>状态</span><StatusBadge :status="loadingListStatusLabel(summary.status)" /></div>
         <template v-if="preloadSummary">
diff --git a/src/modules/loading-lists/components/LoadingListsView.test.ts b/src/modules/loading-lists/components/LoadingListsView.test.ts
index df0c1a2a..bf4c693b 100644
--- a/src/modules/loading-lists/components/LoadingListsView.test.ts
+++ b/src/modules/loading-lists/components/LoadingListsView.test.ts
@@ -96,9 +96,9 @@ describe('LoadingListsView', () => {
   it('keeps transport editing as a detail-page action', () => {
     expect(source).not.toContain('openEditFromRow(row)')
     expect(source).not.toContain('编辑运输信息')
-    expect(detailSource).toContain('纠正集装箱号 / 航次')
+    expect(detailSource).toContain("summary.containerNo || '待补录'")
     expect(detailSource).toContain('v-if="canEditTransport"')
-    expect(preloadDetailSource).toContain("const editDialogTitle = computed(() => '纠正集装箱号 / 航次')")
+    expect(preloadDetailSource).toContain("isContainerCorrection.value ? '纠正集装箱号 / 航次' : '补录集装箱号 / 航次'")
   })
 
   it('refreshes the detail version on A0409 while preserving transport input', () => {
diff --git a/src/modules/loading-lists/pages/PreloadPlanDetailView.test.ts b/src/modules/loading-lists/pages/PreloadPlanDetailView.test.ts
index 8230a4cd..9b6482d3 100644
--- a/src/modules/loading-lists/pages/PreloadPlanDetailView.test.ts
+++ b/src/modules/loading-lists/pages/PreloadPlanDetailView.test.ts
@@ -61,20 +61,22 @@ describe('PreloadPlanDetailView prototype contract', () => {
     expect(source).toContain(':confirm-loading="remarkSaving"')
   })
 
-  it('keeps preload as a correction-only entry before PDA claim and does not imply that preload directly opens PDA', () => {
+  it('supports first entry and reasoned correction before PDA claim without blocking earlier flow', () => {
     expect(source).toContain("{ required: true, message: '请输入集装箱号'")
-    expect(source).toContain("summary.status === 'EDITING'")
+    expect(source).toContain("summary?.status === 'EDITING'")
     expect(source).toContain("(!pdaStatus || pdaStatus === 'PENDING')")
+    expect(source).not.toContain('summary?.containerNo && summary.status')
     expect(source).toContain('PDA 已领取或作业已开始，真实集装箱号只读。')
-    expect(source).toContain("const editDialogTitle = computed(() => '纠正集装箱号 / 航次')")
-    expect(source).toContain("{ required: true, message: '请输入操作原因'")
+    expect(source).toContain("isContainerCorrection.value ? '纠正集装箱号 / 航次' : '补录集装箱号 / 航次'")
+    expect(source).toContain("isContainerCorrection.value && !String(value || '').trim() ? new Error('纠错时请输入操作原因')")
     expect(source).toContain("String(value || '').trim().toUpperCase()")
-    expect(source).toContain('operationReason: editForm.operationReason.trim()')
+    expect(source).toContain('operationReason: editForm.operationReason.trim() || null')
     expect(detailSource).toContain('v-if="canEditTransport"')
-    expect(detailSource).not.toContain("preloadSummary?.containerNo ? '修改集装箱号 / 航次' : '录入集装箱号'")
+    expect(detailSource).toContain("summary.containerNo || '待补录'")
     expect(source).toContain('由服务端按真实条件创建唯一 PDA 任务')
-    expect(source).toContain('真实集装箱号未录入时不能确认')
-    expect(source).toContain('PDA 领取或作业开始后集装箱号只读')
+    expect(source).toContain('缺号不阻断此前流程')
+    expect(source).toContain('PDA 确认装柜完成前由服务端执行最终门禁')
+    expect(source).not.toContain('真实集装箱号未录入时不能确认')
   })
 
   it('uses a flat blocking note instead of repeated colored page alerts', () => {
diff --git a/src/modules/loading-lists/pages/PreloadPlanDetailView.vue b/src/modules/loading-lists/pages/PreloadPlanDetailView.vue
index f9279729..fe835113 100644
--- a/src/modules/loading-lists/pages/PreloadPlanDetailView.vue
+++ b/src/modules/loading-lists/pages/PreloadPlanDetailView.vue
@@ -51,17 +51,19 @@ const canEdit = computed(() => access.can('platform:firstleg:preload:edit'))
 const canCorrectTransport = computed(() => {
   const summary = detail.value?.summary
   const pdaStatus = summary?.readiness.pdaTaskStatus
-  return Boolean(canEdit.value && summary?.containerNo && summary.status === 'EDITING'
+  return Boolean(canEdit.value && summary?.status === 'EDITING'
     && summary.readiness.preloadPushed && (!pdaStatus || pdaStatus === 'PENDING'))
 })
+const isContainerCorrection = computed(() => Boolean(detail.value?.summary.containerNo))
 const transportCorrectionNote = computed(() => {
   const summary = detail.value?.summary
-  if (!summary?.containerNo) return '真实集装箱号尚未录入；请返回货柜管理，通过“关联已放舱订舱”完成初次录入。'
+  if (!summary) return ''
   if (summary.readiness.pdaTaskStatus && summary.readiness.pdaTaskStatus !== 'PENDING') return 'PDA 已领取或作业已开始，真实集装箱号只读。'
   if (!canCorrectTransport.value) return '当前服务端阶段不允许纠正真实集装箱号。'
-  return '真实集装箱号仅可在 PDA 领取前纠错，保存时必须填写操作原因。'
+  if (!summary.containerNo) return '真实集装箱号待补录；可在预装详情首次录入，PDA 领取或作业开始后只读。'
+  return '真实集装箱号仅可在 PDA 领取前纠错，纠错保存时必须填写操作原因。'
 })
-const editDialogTitle = computed(() => '纠正集装箱号 / 航次')
+const editDialogTitle = computed(() => isContainerCorrection.value ? '纠正集装箱号 / 航次' : '补录集装箱号 / 航次')
 const editRules: FormRules = {
   containerNo: [
     { required: true, message: '请输入集装箱号', trigger: 'blur' },
@@ -69,7 +71,7 @@ const editRules: FormRules = {
   ],
   voyageNo: [{ max: 64, message: '航次不能超过 64 个字符', trigger: 'blur' }],
   operationReason: [
-    { required: true, message: '请输入操作原因', trigger: 'blur' },
+    { validator: (_rule, value, callback) => callback(isContainerCorrection.value && !String(value || '').trim() ? new Error('纠错时请输入操作原因') : undefined), trigger: 'blur' },
     { max: 500, message: '操作原因不能超过 500 个字符', trigger: 'blur' },
   ],
 }
@@ -135,6 +137,7 @@ function openEdit() {
 
 async function saveTransport() {
   if (!detail.value || !canCorrectTransport.value || !(await editFormRef.value?.validate().catch(() => false))) return
+  const correcting = isContainerCorrection.value
   editForm.containerNo = normalizedContainerNo(editForm.containerNo)
   editSaving.value = true
   editError.value = null
@@ -142,11 +145,11 @@ async function saveTransport() {
     detail.value = await updatePreloadTransport(planId.value, warehouseId.value, {
       containerNo: editForm.containerNo,
       voyageNo: editForm.voyageNo.trim() || null,
-      operationReason: editForm.operationReason.trim(),
+      operationReason: editForm.operationReason.trim() || null,
       expectedVersion: detail.value.summary.version,
     })
     editOpen.value = false
-    ElMessage.success('运输信息已更新')
+    ElMessage.success(correcting ? '运输信息已纠正' : '真实集装箱号已补录')
   } catch (cause) {
     const details = getApiErrorDetails(cause, '运输信息保存失败，请刷新详情后重试')
     if (details.code === 'A0409' || /版本|并发|已被其他人修改/.test(details.message)) {
@@ -247,9 +250,9 @@ watch([planId, warehouseId], () => void loadDetail())
 
     <AppDialog v-model="editOpen" class="loading-transport-dialog" :title="editDialogTitle" width="min(620px, calc(100vw - 28px))" confirm-text="保存" :confirm-loading="editSaving" :confirm-disabled="!canEdit" @confirm="saveTransport">
       <el-form ref="editFormRef" class="transport-form" :model="editForm" :rules="editRules" label-position="top">
-        <el-form-item label="真实集装箱号" prop="containerNo"><el-input v-model="editForm.containerNo" maxlength="64" placeholder="请输入港口取得的真实集装箱号" @blur="editForm.containerNo = normalizedContainerNo(editForm.containerNo)" /></el-form-item>
+        <el-form-item label="真实集装箱号" prop="containerNo"><el-input v-model="editForm.containerNo" maxlength="64" placeholder="请输入提柜后取得的真实集装箱号" @blur="editForm.containerNo = normalizedContainerNo(editForm.containerNo)" /></el-form-item>
         <el-form-item label="航次" prop="voyageNo"><el-input v-model="editForm.voyageNo" maxlength="64" placeholder="请输入航次" /></el-form-item>
-        <el-form-item label="操作原因" prop="operationReason"><el-input v-model="editForm.operationReason" type="textarea" :rows="3" maxlength="500" placeholder="必填，将记录在操作历史中" /></el-form-item>
+        <el-form-item :label="isContainerCorrection ? '纠错原因' : '操作原因（可选）'" prop="operationReason"><el-input v-model="editForm.operationReason" type="textarea" :rows="3" maxlength="500" :placeholder="isContainerCorrection ? '必填，将记录在操作历史中' : '可填写补录说明'" /></el-form-item>
       </el-form>
     </AppDialog>
 
@@ -265,11 +268,11 @@ watch([planId, warehouseId], () => void loadDetail())
 
     <AppDialog v-model="confirmOpen" class="preload-confirm-dialog" title="确认整份预装计划" width="min(520px, calc(100vw - 28px))" confirm-text="确认预装" :confirm-loading="confirmSaving" :confirm-disabled="!detail?.summary.readiness.canConfirm" @confirm="submitConfirmPreload">
       <div class="confirm-content">
-        <el-alert type="warning" :closable="false" show-icon title="本操作将确认整份预装计划" description="真实集装箱号未录入时不能确认；PDA 领取或作业开始后集装箱号只读。系统会原子确认本计划包含的全部入库预装票据，并由服务端按真实条件创建唯一 PDA 任务；当前页面不会伪造 PDA 成功。" />
+        <el-alert type="warning" :closable="false" show-icon title="本操作将确认整份预装计划" description="真实集装箱号可在提柜或预装详情补录，缺号不阻断此前流程；PDA 确认装柜完成前由服务端执行最终门禁。系统会原子确认本计划包含的全部入库预装票据，并由服务端按真实条件创建唯一 PDA 任务；当前页面不会伪造 PDA 成功。" />
         <el-descriptions v-if="detail" :column="1" border>
           <el-descriptions-item label="预装单号">{{ detail.summary.preloadNo }}</el-descriptions-item>
           <el-descriptions-item label="柜次号">{{ detail.summary.cabinetNo || '—' }}</el-descriptions-item>
-          <el-descriptions-item label="集装箱号">{{ detail.summary.containerNo || '待录入' }}</el-descriptions-item>
+          <el-descriptions-item label="集装箱号">{{ detail.summary.containerNo || '待补录' }}</el-descriptions-item>
         </el-descriptions>
       </div>
     </AppDialog>
diff --git a/src/modules/ocean-bookings/types.ts b/src/modules/ocean-bookings/types.ts
index 2285f445..8b3b705d 100644
--- a/src/modules/ocean-bookings/types.ts
+++ b/src/modules/ocean-bookings/types.ts
@@ -44,7 +44,7 @@ export interface OceanBookingContainerRequirement {
 export interface OceanBookingAllocatedContainer {
   containerBookingId: string
   cabinetNo: string
-  containerNo: string
+  containerNo: string | null
   requirementId: string
   containerType: OceanBookingContainerType
   containerKind: string
diff --git a/src/modules/trucking/api/platformTrucking.test.ts b/src/modules/trucking/api/platformTrucking.test.ts
index 2f46fab4..b029bd54 100644
--- a/src/modules/trucking/api/platformTrucking.test.ts
+++ b/src/modules/trucking/api/platformTrucking.test.ts
@@ -20,10 +20,23 @@ describe('truck appointment API', () => {
     await expect(getTruckAppointment('9001')).resolves.toMatchObject({ id: '9001' })
     await expect(createTruckAppointment({ carrierId: '200', oceanBookingId: '300', containerBookingId: '400', loadingPlanId: null, plannedLoadingAt: '2026-08-10T10:00:00', expectedVersion: 0 })).resolves.toMatchObject({ id: '9001' })
     expect(http.post).toHaveBeenNthCalledWith(1, '/platform/v1/truck-appointments', { carrierId: '200', oceanBookingId: '300', containerBookingId: '400', loadingPlanId: null, plannedLoadingAt: '2026-08-10T10:00:00', currency: 'RMB', expectedVersion: 0 })
-    await expect(performTruckAppointmentAction('9001', 'DISPATCH', 2)).resolves.toMatchObject({ status: 'DISPATCHED' })
+    await expect(performTruckAppointmentAction('9001', 'DISPATCH', { expectedVersion: 2 })).resolves.toMatchObject({ status: 'DISPATCHED' })
     expect(http.post).toHaveBeenCalledWith('/platform/v1/truck-appointments/9001/dispatch', { expectedVersion: 2, reason: null }, { headers: { 'Idempotency-Key': expect.stringContaining('truck-appointment-dispatch-9001-') } })
   })
 
+  it('sends the real ISO container number only with the pickup action', async () => {
+    vi.mocked(http.post).mockResolvedValue({ data: { id: '9001', status: 'PICKUP_IN_PROGRESS', containerNo: 'MSCU6639870' } })
+    await performTruckAppointmentAction('9001', 'PICKUP', { expectedVersion: 3, containerNo: 'MSCU6639870' })
+    expect(http.post).toHaveBeenCalledWith('/platform/v1/truck-appointments/9001/pickup', {
+      expectedVersion: 3, reason: null, containerNo: 'MSCU6639870',
+    }, { headers: { 'Idempotency-Key': expect.stringContaining('truck-appointment-pickup-9001-') } })
+
+    await performTruckAppointmentAction('9002', 'PICKUP', { expectedVersion: 1, containerNo: null })
+    expect(http.post).toHaveBeenLastCalledWith('/platform/v1/truck-appointments/9002/pickup', {
+      expectedVersion: 1, reason: null,
+    }, { headers: { 'Idempotency-Key': expect.stringContaining('truck-appointment-pickup-9002-') } })
+  })
+
   it('drops legacy customer fields instead of forwarding hidden compatibility data', async () => {
     vi.mocked(http.post).mockResolvedValueOnce({ data: { id: '9001', status: 'DRAFT', attachmentCount: 0 } })
     const payload = { carrierId: '200', oceanBookingId: '300', containerBookingId: '400', plannedLoadingAt: '2026-08-10T10:00:00', expectedVersion: 0, currency: 'EUR', receivableAmount: '999.00', customerId: 'legacy-customer', customerName: '旧客户快照' }
diff --git a/src/modules/trucking/api/platformTrucking.ts b/src/modules/trucking/api/platformTrucking.ts
index e95378a8..40fceb4e 100644
--- a/src/modules/trucking/api/platformTrucking.ts
+++ b/src/modules/trucking/api/platformTrucking.ts
@@ -5,6 +5,7 @@ import type {
   TruckAppointmentPage,
   TruckAppointmentQuery,
   TruckAppointmentResource,
+  TruckAppointmentActionRequest,
   TruckAppointmentStatusHistory,
   TruckAttachmentReference,
   TruckAttachmentType,
@@ -110,13 +111,17 @@ export type TruckAppointmentAction = 'SUBMIT' | 'DISPATCH' | 'PICKUP' | 'ARRIVE'
 export async function performTruckAppointmentAction(
   id: string | number,
   action: TruckAppointmentAction,
-  expectedVersion: number,
-  reason?: string,
+  payload: TruckAppointmentActionRequest,
   idempotencyKey?: string,
   requestHash?: string,
 ) {
   const operationKey = idempotencyKey || operationId(action, id)
-  const response = await http.post<ApiEnvelope<TruckAppointmentResource>, ApiEnvelope<TruckAppointmentResource>>(`${basePath}/${id}/${action.toLowerCase()}`, { expectedVersion, reason: reason || null }, {
+  const body = {
+    expectedVersion: payload.expectedVersion,
+    reason: payload.reason || null,
+    ...(payload.containerNo ? { containerNo: payload.containerNo } : {}),
+  }
+  const response = await http.post<ApiEnvelope<TruckAppointmentResource>, ApiEnvelope<TruckAppointmentResource>>(`${basePath}/${id}/${action.toLowerCase()}`, body, {
     headers: { 'Idempotency-Key': operationKey, ...(requestHash ? { 'X-Request-Hash': requestHash } : {}) },
   })
   return unwrapApiResponse(response)
diff --git a/src/modules/trucking/components/TruckAppointmentForm.behavior.test.ts b/src/modules/trucking/components/TruckAppointmentForm.behavior.test.ts
index b279b8a6..f5fe46b2 100644
--- a/src/modules/trucking/components/TruckAppointmentForm.behavior.test.ts
+++ b/src/modules/trucking/components/TruckAppointmentForm.behavior.test.ts
@@ -35,7 +35,7 @@ function detail(id: string) {
     containers: id === 'booking-1'
       ? [
           { containerBookingId: 'container-1', cabinetNo: 'CAB-1', containerNo: 'CBHU8888883' },
-          { containerBookingId: 'container-invalid', cabinetNo: 'CAB-X', containerNo: '错误柜号' },
+          { containerBookingId: 'container-pending', cabinetNo: 'CAB-X', containerNo: null, containerType: '40HC' },
         ]
       : [{ containerBookingId: 'container-2', cabinetNo: 'CAB-2', containerNo: 'MSCU6639870' }],
   }
@@ -48,7 +48,7 @@ describe('TruckAppointmentForm booking-only behavior', () => {
     vi.mocked(getOceanBooking).mockImplementation(async (id) => detail(id) as never)
   })
 
-  it('selects a released booking, exposes only valid real containers, and never emits customer fields', async () => {
+  it('selects a released booking, exposes pending-pickup internal containers, and never emits customer fields', async () => {
     const wrapper = mount(TruckAppointmentForm, { props: { modelValue: { ...model } }, global: { plugins: [ElementPlus] } })
     await flushPromises()
     const selects = wrapper.findAllComponents({ name: 'ElSelect' })
@@ -58,7 +58,7 @@ describe('TruckAppointmentForm booking-only behavior', () => {
     expect(getOceanBooking).toHaveBeenCalledWith('booking-1')
     const labels = wrapper.findAllComponents({ name: 'ElOption' }).map((option) => String(option.props('label') || ''))
     expect(labels.some((label) => label.includes('CAB-1') && label.includes('CBHU8888883'))).toBe(true)
-    expect(labels.some((label) => label.includes('CAB-X'))).toBe(false)
+    expect(labels.some((label) => label.includes('CAB-X') && label.includes('40HC') && label.includes('待补录'))).toBe(true)
     const emitted = wrapper.emitted('update:modelValue')?.at(-1)?.[0] as SaveTruckAppointmentRequest
     expect(emitted.oceanBookingId).toBe('booking-1')
     expect(emitted.billOfLadingNo).toBe('BL-1')
diff --git a/src/modules/trucking/components/TruckAppointmentForm.test.ts b/src/modules/trucking/components/TruckAppointmentForm.test.ts
index d87c4d2b..f06ff3bb 100644
--- a/src/modules/trucking/components/TruckAppointmentForm.test.ts
+++ b/src/modules/trucking/components/TruckAppointmentForm.test.ts
@@ -6,22 +6,23 @@ const source = readFileSync(resolve(process.cwd(), 'src/modules/trucking/compone
 const typesSource = readFileSync(resolve(process.cwd(), 'src/modules/trucking/types.ts'), 'utf8')
 
 describe('TruckAppointmentForm interaction contract', () => {
-  it('requires a released booking before a real-numbered allocated container', () => {
+  it('requires a released booking before an allocated internal container', () => {
     expect(source).toContain("listOceanBookings({ page: 1, size: 200, status: 'RELEASED' })")
     expect(source).toContain("oceanBookingId: [{ required: true, message: '请选择已放舱订舱'")
-    expect(source).toContain("containerBookingId: [{ required: true, message: '请选择该订舱下已录真实集装箱号的柜次'")
-    expect(source.indexOf('label="订舱"')).toBeLessThan(source.indexOf('label="柜次（真实集装箱号）"'))
+    expect(source).toContain("containerBookingId: [{ required: true, message: '请选择该订舱下已分配的柜次'")
+    expect(source.indexOf('label="订舱"')).toBeLessThan(source.indexOf('label="柜次"'))
     expect(source).toContain(':disabled="!draft.oceanBookingId || bookingContainersLoading"')
     expect(source).not.toContain('关联订舱（可选）')
     expect(source).not.toContain('关联柜次（可选）')
   })
 
-  it('loads only containers allocated to the selected booking and filters missing or malformed physical numbers', () => {
+  it('loads every container allocated to the selected booking without requiring a physical number', () => {
     expect(source).toContain('getOceanBooking(bookingId)')
     expect(source).toContain('containers.value = booking.containers || []')
     expect(source).toContain('bookingDocuments.value = booking.documents || []')
-    expect(source).toContain('isIso6346ContainerNumber(item.containerNo)')
-    expect(source).toContain('该订舱暂无已录真实集装箱号的柜次')
+    expect(source).toContain('const selectableContainers = computed(() => containers.value)')
+    expect(source).toContain('该订舱暂无已分配柜次')
+    expect(source).not.toContain('isIso6346ContainerNumber')
     expect(source).not.toContain('listContainers')
   })
 
@@ -54,9 +55,10 @@ describe('TruckAppointmentForm interaction contract', () => {
     expect(source).toContain('请选择有效的合作中拖车供应商')
   })
 
-  it('labels the generated cabinet reference and physical container number separately', () => {
+  it('labels the internal cabinet, type and pickup-time physical number separately', () => {
     expect(source).toContain('柜次号：${item.cabinetNo')
-    expect(source).toContain('集装箱号：${item.containerNo}')
+    expect(source).toContain('柜型：${item.containerType')
+    expect(source).toContain("集装箱号：${item.containerNo || '待补录'}")
   })
 
   it('keeps the form usable at 390px', () => {
diff --git a/src/modules/trucking/components/TruckAppointmentForm.vue b/src/modules/trucking/components/TruckAppointmentForm.vue
index 1025fde5..3ed53071 100644
--- a/src/modules/trucking/components/TruckAppointmentForm.vue
+++ b/src/modules/trucking/components/TruckAppointmentForm.vue
@@ -7,7 +7,6 @@ import { listSuppliers, type Supplier } from '@/modules/suppliers'
 import { getOceanBooking, listOceanBookings, type OceanBookingAllocatedContainer, type OceanBookingDocument, type OceanBookingResource } from '@/modules/ocean-bookings'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
-import { isIso6346ContainerNumber } from '../iso6346'
 
 const props = defineProps<{ modelValue: SaveTruckAppointmentRequest; resource?: TruckAppointmentResource | null; readonly?: boolean; submitting?: boolean; submitBlocked?: boolean }>()
 const emit = defineEmits<{ 'update:modelValue': [SaveTruckAppointmentRequest]; submit: []; attachments: [] }>()
@@ -37,7 +36,7 @@ const rules: FormRules = {
     if (!draft.billOfLadingNo?.trim()) return callback(new Error('所选订舱缺少有效提单号'))
     return callback(bookingDocumentReady.value ? undefined : new Error('所选订舱缺少有效的订舱确认文件或提单文件'))
   }, trigger: 'change' }],
-  containerBookingId: [{ required: true, message: '请选择该订舱下已录真实集装箱号的柜次', trigger: 'change' }, { validator: (_rule, value, callback) => callback(selectableContainers.value.some((item) => item.containerBookingId === String(value)) || (props.readonly && selectedContainerFallback.value?.id === String(value)) ? undefined : new Error('请选择该订舱下有效的真实柜号柜次')), trigger: 'change' }],
+  containerBookingId: [{ required: true, message: '请选择该订舱下已分配的柜次', trigger: 'change' }, { validator: (_rule, value, callback) => callback(selectableContainers.value.some((item) => item.containerBookingId === String(value)) || (props.readonly && selectedContainerFallback.value?.id === String(value)) ? undefined : new Error('请选择该订舱下有效的已分配柜次')), trigger: 'change' }],
   carrierId: [{ required: true, message: '请选择承运商', trigger: 'change' }, { validator: (_rule, value, callback) => callback(selectableCarriers.value.some((item) => String(item.id) === String(value)) ? undefined : new Error('请选择有效的合作中拖车供应商')), trigger: 'change' }],
   plannedLoadingAt: [{ required: true, message: '请选择预计装箱时间', trigger: 'change' }],
   fleetPhone: [phoneRule('车队电话')], driverPhone: [phoneRule('司机电话')], storePhone: [phoneRule('门店电话')],
@@ -54,14 +53,17 @@ const selectableCarriers = computed(() => carriers.value.filter((item) => (
 )))
 const selectedReleasedBooking = computed(() => bookings.value.find((item) => item.id === draft.oceanBookingId && item.status === 'RELEASED') || null)
 const bookingDocumentReady = computed(() => bookingDocuments.value.some((document) => document.valid && ['BOOKING_CONFIRMATION', 'BILL_OF_LADING'].includes(document.documentType)))
-const selectableContainers = computed(() => containers.value.filter((item) => isIso6346ContainerNumber(item.containerNo)))
+const selectableContainers = computed(() => containers.value)
+function containerOptionLabel(item: OceanBookingAllocatedContainer) {
+  return `柜次号：${item.cabinetNo || '待生成'} / 柜型：${item.containerType || '—'} / 集装箱号：${item.containerNo || '待补录'}`
+}
 const selectedContainerFallback = computed(() => {
   const id = draft.containerBookingId
   const snapshot = props.resource
   if (!id || selectableContainers.value.some((item) => String(item.containerBookingId) === String(id)) || String(snapshot?.containerBookingId) !== String(id)) return null
   return {
     id: String(id),
-    label: `柜次号：${snapshot?.cabinetNo || '待生成'} / 集装箱号：${snapshot?.containerNo || '待录入'}`,
+    label: `柜次号：${snapshot?.cabinetNo || '待生成'} / 柜型：${snapshot?.relatedContainerType || '—'} / 集装箱号：${snapshot?.containerNo || '待补录'}`,
   }
 })
 const selectedBookingFallback = computed(() => {
@@ -154,13 +156,13 @@ watch(() => props.readonly, (readonly) => { if (!readonly && !bookings.value.len
 
 <template>
   <el-form ref="formRef" :model="draft" :rules="rules" label-position="top" :disabled="readonly || submitting" class="truck-form">
-    <div class="relation-note"><span>拖车预约必须先选择已放舱订舱，再选择该订舱下已录入真实 ISO 集装箱号的柜次；仓库和提单号由订舱冻结资料带入，最终资格仍由服务端校验。</span><div v-if="$slots['relation-note-actions']" class="relation-note__actions"><slot name="relation-note-actions" /></div></div>
+    <div class="relation-note"><span>拖车预约必须先选择已放舱订舱，再选择该订舱下已分配的内部柜次；真实集装箱号可待司机提柜时录入，仓库和提单号由订舱冻结资料带入，最终资格仍由服务端校验。</span><div v-if="$slots['relation-note-actions']" class="relation-note__actions"><slot name="relation-note-actions" /></div></div>
     <el-alert v-if="relationWarning" type="warning" :closable="false" show-icon :title="relationWarning" class="relation-alert" />
     <el-alert v-if="optionsError" type="warning" :closable="false" show-icon :title="optionsError" class="relation-alert"><el-button link type="warning" :loading="optionsLoading" @click="loadOptions">重新加载选项</el-button></el-alert>
     <el-row :gutter="16">
       <el-col :xs="24"><el-divider content-position="left">订舱与柜次（必填）</el-divider></el-col>
       <el-col class="relation-column" :xs="24" :sm="12"><el-form-item label="订舱" prop="oceanBookingId"><el-select :model-value="draft.oceanBookingId" filterable placeholder="请先选择已放舱订舱" :loading="optionsLoading" no-data-text="暂无可用的已放舱订舱" style="width:100%" @update:model-value="selectBooking(String($event || ''))"><el-option v-if="selectedBookingFallback" :key="selectedBookingFallback.id" :label="selectedBookingFallback.label" :value="selectedBookingFallback.id" /><el-option v-for="item in bookings" :key="item.id" :label="`${item.bookingNo || '订舱号缺失'}${item.billOfLadingNo ? ` / 提单号：${item.billOfLadingNo}` : ''}`" :value="item.id" /></el-select></el-form-item></el-col>
-      <el-col class="relation-column" :xs="24" :sm="12"><el-form-item label="柜次（真实集装箱号）" prop="containerBookingId"><el-select :model-value="draft.containerBookingId" filterable :disabled="!draft.oceanBookingId || bookingContainersLoading" placeholder="请先选择订舱，再选择真实柜号柜次" :loading="bookingContainersLoading" :no-data-text="draft.oceanBookingId ? '该订舱暂无已录真实集装箱号的柜次' : '请先选择订舱'" style="width:100%" @update:model-value="selectContainer(String($event || ''))"><el-option v-if="selectedContainerFallback" :key="selectedContainerFallback.id" :label="selectedContainerFallback.label" :value="selectedContainerFallback.id" :disabled="!readonly" /><el-option v-for="item in selectableContainers" :key="item.containerBookingId" :label="`柜次号：${item.cabinetNo || '待生成'} / 集装箱号：${item.containerNo}`" :value="item.containerBookingId" /></el-select><div v-if="bookingContainersError" class="field-error"><span>{{ bookingContainersError.message }}</span><ApiErrorMeta :details="bookingContainersError" /><el-button link type="primary" :loading="bookingContainersLoading" @click="draft.oceanBookingId && loadBookingContainers(String(draft.oceanBookingId))">重新加载</el-button></div><div v-else-if="draft.oceanBookingId && !bookingContainersLoading && !selectableContainers.length" class="field-hint">只有已分配至该订舱且已录入真实 ISO 集装箱号的柜次可以预约拖车。</div></el-form-item></el-col>
+      <el-col class="relation-column" :xs="24" :sm="12"><el-form-item label="柜次" prop="containerBookingId"><el-select :model-value="draft.containerBookingId" filterable :disabled="!draft.oceanBookingId || bookingContainersLoading" placeholder="请先选择订舱，再选择已分配柜次" :loading="bookingContainersLoading" :no-data-text="draft.oceanBookingId ? '该订舱暂无已分配柜次' : '请先选择订舱'" style="width:100%" @update:model-value="selectContainer(String($event || ''))"><el-option v-if="selectedContainerFallback" :key="selectedContainerFallback.id" :label="selectedContainerFallback.label" :value="selectedContainerFallback.id" :disabled="!readonly" /><el-option v-for="item in selectableContainers" :key="item.containerBookingId" :label="containerOptionLabel(item)" :value="item.containerBookingId" /></el-select><div v-if="bookingContainersError" class="field-error"><span>{{ bookingContainersError.message }}</span><ApiErrorMeta :details="bookingContainersError" /><el-button link type="primary" :loading="bookingContainersLoading" @click="draft.oceanBookingId && loadBookingContainers(String(draft.oceanBookingId))">重新加载</el-button></div><div v-else-if="draft.oceanBookingId && !bookingContainersLoading && !selectableContainers.length" class="field-hint">只有已分配至该订舱的内部柜次可以预约拖车。</div></el-form-item></el-col>
       <el-col :xs="24"><el-divider content-position="left">基本信息</el-divider></el-col>
       <el-col v-if="draft.oceanBookingId && !bookingContainersLoading && !bookingContainersError && !draft.billOfLadingNo?.trim()" :xs="24"><el-alert title="所选订舱缺少有效提单号，暂不能创建或保存拖车预约" type="warning" :closable="false" show-icon /></el-col>
       <el-col v-if="draft.oceanBookingId && !bookingContainersLoading && !bookingContainersError && !bookingDocumentReady" :xs="24"><el-alert title="所选订舱缺少有效的订舱确认文件或提单文件，暂不能创建或保存拖车预约" type="warning" :closable="false" show-icon /></el-col>
diff --git a/src/modules/trucking/pages/TruckAppointmentDetailView.test.ts b/src/modules/trucking/pages/TruckAppointmentDetailView.test.ts
index eb96c572..5b45fb05 100644
--- a/src/modules/trucking/pages/TruckAppointmentDetailView.test.ts
+++ b/src/modules/trucking/pages/TruckAppointmentDetailView.test.ts
@@ -41,10 +41,10 @@ describe('TruckAppointmentDetailView status contract', () => {
     expect(source).toContain("error.value = getApiErrorDetails(err, '保存失败，请稍后重试')")
   })
 
-  it('blocks dispatch until the released booking, allocated real container and frozen bill number are present', () => {
+  it('blocks dispatch until the released booking, allocated internal container and frozen documents are present', () => {
     expect(source).toContain("return '确认派车前必须关联已放舱订舱'")
     expect(source).toContain("return '确认派车前必须关联该订舱下的柜次'")
-    expect(source).toContain("return '确认派车前关联柜次必须录入真实 ISO 集装箱号'")
+    expect(source).not.toContain("return '确认派车前关联柜次必须录入真实 ISO 集装箱号'")
     expect(source).toContain("return '确认派车前所选订舱必须填写提单号'")
     expect(source).toContain("return '确认派车前所选订舱必须上传有效的订舱确认文件或提单文件'")
     expect(source).toContain('getOceanBooking(resource.value.oceanBookingId)')
@@ -52,6 +52,16 @@ describe('TruckAppointmentDetailView status contract', () => {
     expect(source).not.toContain("item.attachmentType === 'BILL_OF_LADING'")
   })
 
+  it('collects a real ISO container number only when dispatched work starts pickup', () => {
+    expect(source).toContain("resource.value?.status === 'DISPATCHED' && status === 'PICKUP_IN_PROGRESS'")
+    expect(source).toContain("ElMessageBox.prompt('提柜后可填写，也可稍后在预装补录。'")
+    expect(source).toContain('inputValue: normalizeIso6346ContainerNumber(resource.value.containerNo)')
+    expect(source).toContain("inputValidator: (value) => !normalizeIso6346ContainerNumber(value) || isIso6346ContainerNumber(value) || '请输入有效的 ISO 6346 集装箱号'")
+    expect(source).toContain('return { containerNo: normalizeIso6346ContainerNumber(value) || null }')
+    expect(source).toContain('performTruckAppointmentAction(id.value, action, { expectedVersion: form.expectedVersion || 0, ...actionPayload })')
+    expect(source).toContain('await ElMessageBox.confirm(`确认将状态改为“${truckAppointmentStatusLabels[status]}”？`')
+  })
+
   it('keeps the main detail available when attachments or history fail', () => {
     expect(source).toContain('Promise.allSettled([')
     expect(source).toContain("attachments.status === 'fulfilled'")
diff --git a/src/modules/trucking/pages/TruckAppointmentDetailView.vue b/src/modules/trucking/pages/TruckAppointmentDetailView.vue
index f398a6d1..71e35b96 100644
--- a/src/modules/trucking/pages/TruckAppointmentDetailView.vue
+++ b/src/modules/trucking/pages/TruckAppointmentDetailView.vue
@@ -14,7 +14,7 @@ import { getTruckAppointment, listTruckAppointmentAttachments, listTruckAppointm
 import TruckAppointmentForm from '../components/TruckAppointmentForm.vue'
 import TruckAttachmentDialog from '../components/TruckAttachmentDialog.vue'
 import { TRUCK_APPOINTMENT_SAVE_FIELDS, normalizeTruckAppointmentCurrency, truckAppointmentActionLabel, truckAppointmentStatusLabel, truckAppointmentStatusLabels, type SaveTruckAppointmentRequest, type TruckAppointmentResource, type TruckAppointmentStatus, type TruckAppointmentStatusHistory } from '../types'
-import { isIso6346ContainerNumber } from '../iso6346'
+import { isIso6346ContainerNumber, normalizeIso6346ContainerNumber } from '../iso6346'
 const route = useRoute(); const router = useRouter(); const loading = ref(false); const saving = ref(false); const statusSaving = ref(false); const attachmentOpen = ref(false); const resource = ref<TruckAppointmentResource | null>(null); const error = ref<ApiErrorDetails | null>(null); const form = reactive<SaveTruckAppointmentRequest>({ expectedVersion: 0, carrierId: null, oceanBookingId: null, containerBookingId: null, plannedLoadingAt: null })
 const history = ref<TruckAppointmentStatusHistory[]>([])
 const bookingReadiness = ref<OceanBookingDetail | null>(null)
@@ -51,15 +51,27 @@ const dispatchBlockReason = computed(() => {
   if (!form.oceanBookingId) return '确认派车前必须关联已放舱订舱'
   if (bookingReadiness.value && bookingReadiness.value.status !== 'RELEASED') return '确认派车前必须关联已放舱订舱'
   if (!form.containerBookingId) return '确认派车前必须关联该订舱下的柜次'
-  if (!isIso6346ContainerNumber(resource.value.containerNo)) return '确认派车前关联柜次必须录入真实 ISO 集装箱号'
   if (!form.billOfLadingNo?.trim()) return '确认派车前所选订舱必须填写提单号'
   if (bookingReadiness.value && !bookingReadiness.value.documents.some((document) => document.valid && ['BOOKING_CONFIRMATION', 'BILL_OF_LADING'].includes(document.documentType))) return '确认派车前所选订舱必须上传有效的订舱确认文件或提单文件'
   return ''
 })
+async function confirmStatusChange(status: TruckAppointmentStatus) {
+  if (resource.value?.status === 'DISPATCHED' && status === 'PICKUP_IN_PROGRESS') {
+    const { value } = await ElMessageBox.prompt('提柜后可填写，也可稍后在预装补录。', '开始提柜', {
+      confirmButtonText: '确认提柜', cancelButtonText: '取消', type: 'warning',
+      inputValue: normalizeIso6346ContainerNumber(resource.value.containerNo),
+      inputPlaceholder: '选填，例如 MSCU6639870',
+      inputValidator: (value) => !normalizeIso6346ContainerNumber(value) || isIso6346ContainerNumber(value) || '请输入有效的 ISO 6346 集装箱号',
+    })
+    return { containerNo: normalizeIso6346ContainerNumber(value) || null }
+  }
+  await ElMessageBox.confirm(`确认将状态改为“${truckAppointmentStatusLabels[status]}”？`, '状态变更确认', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' })
+  return {}
+}
 async function changeStatus(status: TruckAppointmentStatus) {
   if (!resource.value || status === resource.value.status || statusSaving.value) return
   if (status === 'DISPATCHED' && dispatchBlockReason.value) { error.value = { message: dispatchBlockReason.value }; return }
-  try { await ElMessageBox.confirm(`确认将状态改为“${truckAppointmentStatusLabels[status]}”？`, '状态变更确认', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }); statusSaving.value = true; if (status === 'RESCHEDULED') { await rescheduleTruckAppointment(id.value, form.plannedLoadingAt || '', form.expectedVersion || 0, '后台改约') } else { const action = actionByTarget[status]; if (!action) throw new Error('当前状态没有可用动作'); await performTruckAppointmentAction(id.value, action, form.expectedVersion || 0) } ElMessage.success('状态已更新'); await load() } catch (err) { if (err !== 'cancel' && !(err instanceof Error && err.message === 'cancel')) error.value = getApiErrorDetails(err, '状态更新失败，请稍后重试') } finally { statusSaving.value = false }
+  try { const actionPayload = await confirmStatusChange(status); statusSaving.value = true; if (status === 'RESCHEDULED') { await rescheduleTruckAppointment(id.value, form.plannedLoadingAt || '', form.expectedVersion || 0, '后台改约') } else { const action = actionByTarget[status]; if (!action) throw new Error('当前状态没有可用动作'); await performTruckAppointmentAction(id.value, action, { expectedVersion: form.expectedVersion || 0, ...actionPayload }) } ElMessage.success('状态已更新'); await load() } catch (err) { if (err !== 'cancel' && !(err instanceof Error && err.message === 'cancel')) error.value = getApiErrorDetails(err, '状态更新失败，请稍后重试') } finally { statusSaving.value = false }
 }
 onMounted(load)
 onActivated(() => {
diff --git a/src/modules/trucking/pages/TruckAppointmentsView.test.ts b/src/modules/trucking/pages/TruckAppointmentsView.test.ts
index 242c1c96..bfdc3e66 100644
--- a/src/modules/trucking/pages/TruckAppointmentsView.test.ts
+++ b/src/modules/trucking/pages/TruckAppointmentsView.test.ts
@@ -129,6 +129,7 @@ describe('TruckAppointmentsView', () => {
     expect(source.indexOf("key: 'payableAmount'")).toBeLessThan(source.indexOf("key: 'plannedLoadingAt'"))
     expect(source).not.toContain('receivableAmount')
     expect(source).not.toContain('应收拖车费')
+    expect(source).toContain("row.containerNo || '待补录'")
     expect(source).toContain("toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })")
     expect(source).toContain("key: 'attachmentCount'")
   })
diff --git a/src/modules/trucking/pages/TruckAppointmentsView.vue b/src/modules/trucking/pages/TruckAppointmentsView.vue
index 2744331c..dcee9702 100644
--- a/src/modules/trucking/pages/TruckAppointmentsView.vue
+++ b/src/modules/trucking/pages/TruckAppointmentsView.vue
@@ -29,7 +29,7 @@ const columns: DataTableColumn[] = [
   { key: 'appointmentNo', prop: 'appointmentNo', label: '派车单号', minWidth: 170 },
   { key: 'oceanBookingNo', prop: 'oceanBookingNo', label: '订舱号', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.oceanBookingNo || '—' },
   { key: 'cabinetNo', prop: 'cabinetNo', label: '柜次号', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.cabinetNo || '—' },
-  { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 145, formatter: (row: TruckAppointmentResource) => row.containerNo || '—' },
+  { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 145, formatter: (row: TruckAppointmentResource) => row.containerNo || '待补录' },
   { key: 'warehouseName', prop: 'warehouseName', label: '装柜仓库', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.warehouseName || '—' },
   { key: 'shippingCompanyName', prop: 'shippingCompanyName', label: '船公司', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.shippingCompanyName || '—' },
   { key: 'bookingAgentName', prop: 'bookingAgentName', label: '订舱代理', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.bookingAgentName || '—' },
diff --git a/src/modules/trucking/types.ts b/src/modules/trucking/types.ts
index e44f63e0..1fc24e7c 100644
--- a/src/modules/trucking/types.ts
+++ b/src/modules/trucking/types.ts
@@ -198,6 +198,12 @@ export interface TruckAppointmentQuery {
   containerType?: string | ''
 }
 
+export interface TruckAppointmentActionRequest {
+  expectedVersion: number
+  reason?: string | null
+  containerNo?: string | null
+}
+
 export interface TruckAppointmentPage {
   records: TruckAppointmentResource[]
   page: number