fix: align audit and dispatch workflows and release failed requests

src/modules/ocean-bookings/AGENTS.md

@@ -20,7 +20,7 @@
 
 ## 关键边界
 
-- 订舱草稿按当前版本维护资料；放舱后运输、关系方、柜型需求、预报货量和附件只读；仅实货量可由订舱编辑权限通过 `/actual-cargo` 按版本、幂等键和原因补录并审计，禁止绕过运输冻结边界。
+- 订舱草稿按当前版本维护资料；放舱后除预计到港外的运输、关系方、柜型需求、预报货量和附件只读；预计到港经 `/estimated-arrival` 按编辑权限、版本和幂等键单独维护，不得清空或早于预计开船；实货量可由订舱编辑权限通过 `/actual-cargo` 按版本、幂等键和原因补录并审计，禁止绕过运输冻结边界。
 - 打印对草稿与已放舱订舱均开放，按当前**已保存**资料生成，未填写字段显示“—”，不用未保存的表单值。托运单取委值，提单确认件取实值；实值由客服手工录入，不回退为委值，不生成正式提单。
 - 关联候选只消费服务端 `/link-candidates` 分页结果，不在浏览器重排或本地拼接候选。
 - 订舱是拖车预约的唯一归属：拖车由 `../trucking/` 创建，本模块不直接建拖车单。

src/modules/ocean-bookings/PROTOTYPE_MATRIX.md

@@ -1,18 +1,19 @@
 # 订舱页面受影响操作核对
 
-业务依据为用户提供的《订舱信息页面说明.docx》及页面截图；本轮确认：放舱后仅补实货量、客服手工录入、保留现有提单确认件，正式提单从外部附件接收。样式使用 `docs/Admin高密度界面规范.md` 的详情与基本信息、蓝白主题及既有公共密度。用户后续提供现页与产品稿对比，确认现页缺少层次、重点且间距过大；订舱页以该产品稿为局部视觉依据：紧凑页头、蓝色圆点连线流程、编号区块、细线小标题、浅底三方卡片及右下主打印按钮。可编辑输入、下拉和文本域使用白底、清晰边框与文字，悬停/聚焦使用蓝色反馈；灰底和禁止光标仅用于真实禁用状态，校验错误仍保留组件错误色。
+业务依据为用户提供的《订舱信息页面说明.docx》及页面截图；本轮确认：放舱后允许单独维护预计到港及补实货量、客服手工录入、保留现有提单确认件，正式提单从外部附件接收。样式使用 `docs/Admin高密度界面规范.md` 的详情与基本信息、蓝白主题及既有公共密度。用户后续提供现页与产品稿对比，确认现页缺少层次、重点且间距过大；订舱页以该产品稿为局部视觉依据：紧凑页头、蓝色圆点连线流程、编号区块、细线小标题、浅底三方卡片及右下主打印按钮。可编辑输入、下拉和文本域使用白底、清晰边框与文字，悬停/聚焦使用蓝色反馈；灰底和禁止光标仅用于真实禁用状态，校验错误仍保留组件错误色。
 
 流程条根据已保存订舱、当前未保存修改、放舱状态及实货量推进：当前步骤蓝底，已通过阶段勾选，待处理灰色。第一步的“已保存”不代替放舱完整性校验；打印节点仅在本次页面成功生成对应数据的 PDF 预览后显示“已预览”，失败或只点击按钮不产生预览事实，也不声称实际打印完成。预览标记随本次页面保留；刷新后按服务端保存/放舱/实值恢复进度，已放舱时托运单阶段保持通过，提示“可重新预览 / 打印”，避免前面灰色、后面完成的断开。放舱前托运单数据改变须重新预览；提单确认件始终要求已保存实值和对应 PDF 成功预览后才完成。
 
 | 页面/路由 | 操作 | 参考承载与布局 | 当前实现 | 页面核对 |
 |---|---|---|---|---|
 | `/ocean-bookings/new`、`/ocean-bookings/:bookingId` | 草稿新增、维护 | 独立页面；左主资料、右三方并排，下方放舱资料 | 移除客户选择、港名、箱种、容量、限重、备注及包装单位选择；预计到港恢复在预计开船旁，并在放舱确认摘要展示；仓库和渠道保留在默认收起的“作业配置”，放舱缺配置时自动展开；委实成对输入，新增保存留在详情 | TEST #702 已核对预计到港恢复、录入保存和刷新回显；完整长字段展示待人工确认 |
+| `/ocean-bookings/:bookingId` | 放舱后维护预计到港 | 本轮用户确认仅开放预计到港；沿用现有单字段AppDialog | 页头独立入口，560px紧凑时间表单，仅提交预计到港和版本，不触及其他冻结资料 | 待1920×1080、100%人工截图确认 |
 | `/ocean-bookings/:bookingId` | 已放舱补实 | 客服补录实际货量 | 运输及预报只读，实值可按编辑权限补录，原因必填并版本审计 | 已核对放舱、原因校验、补实保存和历史；最终 TEST #698 回验实值保存后立即回显，无需刷新 |
 | `/ocean-bookings/:bookingId` | 托运单、提单确认件 | 两个作业入口，A4单据预览 | 两张业务卡片底部右侧的蓝色主按钮，分别直达现有PDF预览；读已保存委/实数据，缺失显示“—” | 弹框开关/重开、PDF 生成与数据映射已核对；内嵌 PDF 空白，显示未通过 |
 
 人工按 1920×1080、100% 缩放核对三方长名称/地址、两类货量、保存失败与版本冲突、冻结/无编辑权限，以及两类 PDF 预览的打开、关闭和重开。自动检查结果在交付中单独报告，不能代替人工截图。
 
-新增订舱默认运费条款 `FREIGHT PREPAID`、运输条款 `CY-CY`、委值 `500 / 15000 / 68`，实值留空；包装按 `CARTONS` 保存，新柜需求为整箱 FCL，容量和限重沿平台柜型规格计算。默认值只用于新增，不覆盖已保存资料。预计到港草稿可留空，放舱前必填且不得早于预计开船；放舱后仍遵守运输资料冻结规则。
+新增订舱默认运费条款 `FREIGHT PREPAID`、运输条款 `CY-CY`、委值 `500 / 15000 / 68`，实值留空；包装按 `CARTONS` 保存，新柜需求为整箱 FCL，容量和限重沿平台柜型规格计算。默认值只用于新增，不覆盖已保存资料。预计到港草稿可留空，放舱前必填且不得早于预计开船；放舱后预计到港允许独立窄命令维护，其余运输资料仍冻结。
 
 用户后续确认预计到港供日历和入库操作使用，恢复该字段及前后端放舱门禁。代码核对：关联柜次时 `ContainerRepository.linkReleasedBooking` 传入订舱预计到港；日历在无实际到港时读柜级预计到港；海外 `ContainerWarehouseArrivalService` 在无人工或计划冻结日期时按到港当地日期加 2 天解析默认到仓，入库计划使用该解析结果，不能把订舱预计到港直接当成计划到仓日期。
 

src/modules/ocean-bookings/api/platformOceanBookings.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { createOceanBooking, deleteOceanBookingDraft, downloadOceanBookingDocument, downloadOceanBookingPrint, invalidateOceanBookingDocument, listOceanBookingAgents, listOceanBookingDocuments, listOceanBookingLinkCandidates, listOceanBookings, listWarehouseLogisticsChannels, referenceOceanBookingDocument, releaseOceanBooking, updateOceanBookingActualCargo, updateOceanBookingDraft, uploadOceanBookingDocument } from './platformOceanBookings'
 import { http } from '@/shared/api/http'
+import { updateOceanBookingEstimatedArrival } from './platformOceanBookings'
 
 const detailResponse = (version = 0, status = 'DRAFT') => ({
   oceanBooking: {
@@ -14,6 +15,16 @@ const detailResponse = (version = 0, status = 'DRAFT') => ({
 })
 
 describe('ocean bookings api', () => {
+  it('预计到港使用窄命令并规范化详情回显与列表到港字段', async () => {
+    const payload = { expectedVersion: 3, estimatedArrivalAt: '2026-10-25T10:00:00' }
+    const raw = detailResponse(4, 'RELEASED')
+    const put = vi.spyOn(http, 'put').mockResolvedValue({ code: '200', data: { ...raw, oceanBooking: { ...raw.oceanBooking, estimatedArrivalAt: payload.estimatedArrivalAt } } })
+    const saved = await updateOceanBookingEstimatedArrival('123', payload)
+    expect(put).toHaveBeenCalledWith('/platform/v1/ocean-bookings/123/estimated-arrival', payload, expect.objectContaining({ headers: { 'Idempotency-Key': expect.any(String) } }))
+    expect(saved.estimatedArrivalAt).toBe(payload.estimatedArrivalAt)
+    expect(saved.eta).toBe(payload.estimatedArrivalAt)
+    expect(saved.version).toBe(4)
+  })
   it('sends actual cargo only to the versioned supplement endpoint and normalizes decimal responses', async () => {
     const payload = { expectedVersion: 3, actualPackageCount: 480, actualGrossWeightKg: 14000.125, actualVolumeCbm: 65.321, reason: '客服补录' }
     const response = detailResponse(4, 'RELEASED')

src/modules/ocean-bookings/api/platformOceanBookings.ts

@@ -98,6 +98,10 @@ export async function updateOceanBookingActualCargo(id: string, payload: OceanBo
   const response = await http.put<ApiEnvelope<OceanBookingDetail>, ApiEnvelope<OceanBookingDetail>>(`${basePath}/${encodeURIComponent(id)}/actual-cargo`, payload, { headers: { 'Idempotency-Key': idempotencyKey() } })
   return detail(unwrapApiResponse(response))
 }
+export async function updateOceanBookingEstimatedArrival(id: string, payload: { expectedVersion: number; estimatedArrivalAt: string }) {
+  const response = await http.put<ApiEnvelope<OceanBookingDetail>, ApiEnvelope<OceanBookingDetail>>(`${basePath}/${encodeURIComponent(id)}/estimated-arrival`, payload, { headers: { 'Idempotency-Key': idempotencyKey() } })
+  return detail(unwrapApiResponse(response))
+}
 export async function deleteOceanBookingDraft(id: string, expectedVersion: number) { await http.delete(`${basePath}/${encodeURIComponent(id)}`, { data: { expectedVersion }, headers: { 'Idempotency-Key': idempotencyKey() } }) }
 export async function releaseOceanBooking(id: string, request: OceanBookingReleaseRequest) { const response = await http.post<ApiEnvelope<OceanBookingDetail>, ApiEnvelope<OceanBookingDetail>>(`${basePath}/${encodeURIComponent(id)}/release`, request, { headers: { 'Idempotency-Key': idempotencyKey() } }); return detail(unwrapApiResponse(response)) }
 const printPaths: Record<OceanBookingPrintType, string> = {

src/modules/ocean-bookings/pages/OceanBookingDetailView.release.test.ts

@@ -12,6 +12,7 @@ import {
   releaseOceanBooking,
   updateOceanBookingDraft,
   updateOceanBookingActualCargo,
+  updateOceanBookingEstimatedArrival,
 } from '../api/platformOceanBookings'
 import type { OceanBookingDetail, OceanBookingStatus } from '../types'
 import OceanBookingDetailView from './OceanBookingDetailView.vue'
@@ -32,7 +33,7 @@ vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
 vi.mock('../api/platformOceanBookings', () => ({
   createOceanBooking: vi.fn(), deleteOceanBookingDraft: vi.fn(), getOceanBooking: vi.fn(),
   listOceanBookingAgents: vi.fn(), listWarehouseLogisticsChannels: vi.fn(),
-  releaseOceanBooking: vi.fn(), updateOceanBookingDraft: vi.fn(), updateOceanBookingActualCargo: vi.fn(),
+  releaseOceanBooking: vi.fn(), updateOceanBookingDraft: vi.fn(), updateOceanBookingActualCargo: vi.fn(), updateOceanBookingEstimatedArrival: vi.fn(),
 }))
 
 function booking(status: OceanBookingStatus = 'DRAFT', version = 3, billOfLadingNo = 'BL-001'): OceanBookingDetail {
@@ -65,6 +66,12 @@ function booking(status: OceanBookingStatus = 'DRAFT', version = 3, billOfLading
 }
 
 type ViewModel = {
+  arrivalValue: string | null
+  arrivalDialogOpen: boolean
+  arrivalSaving: boolean
+  arrivalError: { message: string; code?: string } | null
+  openArrivalDialog: () => void
+  saveEstimatedArrival: () => Promise<void>
   form: { data: import('../types').OceanBookingDraftData }
   saveActualCargo: () => Promise<void>
   actualReason: string
@@ -96,6 +103,63 @@ async function mountView() {
 }
 
 describe('OceanBookingDetailView one-click release', () => {
+  it('放舱后仅单独保存预计到港并立即回显，保留尚未提交的实货量', async () => {
+    vi.mocked(getOceanBooking).mockResolvedValue(booking('RELEASED'))
+    const saved = { ...booking('RELEASED', 4), estimatedArrivalAt: '2026-09-25T08:00:00' }
+    vi.mocked(updateOceanBookingEstimatedArrival).mockResolvedValue(saved)
+    const { wrapper, vm } = await mountView()
+    expect(wrapper.findAll('button').some(button => button.text() === '维护预计到港')).toBe(true)
+    vm.form.data.actualPackageCount = 499
+    vm.actualReason = '尚未提交'
+    vm.openArrivalDialog()
+    vm.arrivalValue = saved.estimatedArrivalAt
+    await vm.saveEstimatedArrival()
+    expect(updateOceanBookingEstimatedArrival).toHaveBeenCalledExactlyOnceWith('123', { expectedVersion: 3, estimatedArrivalAt: saved.estimatedArrivalAt })
+    expect(vm.detail?.estimatedArrivalAt).toBe(saved.estimatedArrivalAt)
+    expect(vm.detail?.version).toBe(4)
+    expect(vm.form.data.actualPackageCount).toBe(499)
+    expect(vm.actualReason).toBe('尚未提交')
+    expect(updateOceanBookingDraft).not.toHaveBeenCalled()
+    const coreForm = wrapper.findAllComponents({ name: 'ElForm' }).find(form => form.classes().includes('booking-groups'))!
+    expect(coreForm.props('disabled')).toBe(true)
+    wrapper.unmount()
+  })
+
+  it('无编辑权限不开放维护入口；版本冲突保留输入并恢复操作', async () => {
+    vi.mocked(getOceanBooking).mockResolvedValue(booking('RELEASED'))
+    deniedPermissions.add('platform:firstleg:ocean-booking:edit')
+    let rendered = await mountView()
+    expect(rendered.wrapper.findAll('button').some(button => button.text() === '维护预计到港')).toBe(false)
+    rendered.vm.openArrivalDialog()
+    await rendered.vm.saveEstimatedArrival()
+    expect(updateOceanBookingEstimatedArrival).not.toHaveBeenCalled()
+    rendered.wrapper.unmount()
+    deniedPermissions.clear()
+    rendered = await mountView()
+    rendered.vm.openArrivalDialog()
+    rendered.vm.arrivalValue = '2026-09-25T08:00:00'
+    vi.mocked(updateOceanBookingEstimatedArrival).mockRejectedValueOnce(new ApiResponseError('版本已变化，请刷新后重试', 'A0409'))
+    await rendered.vm.saveEstimatedArrival()
+    expect(rendered.vm.arrivalDialogOpen).toBe(true)
+    expect(rendered.vm.arrivalValue).toBe('2026-09-25T08:00:00')
+    expect(rendered.vm.arrivalSaving).toBe(false)
+    expect(rendered.vm.arrivalError?.code).toBe('A0409')
+    rendered.wrapper.unmount()
+  })
+
+  it('放舱后预计到港不得清空或早于预计开船', async () => {
+    vi.mocked(getOceanBooking).mockResolvedValue(booking('RELEASED'))
+    const { wrapper, vm } = await mountView()
+    vm.openArrivalDialog()
+    for (const value of [null, '2026-08-01T08:00:00']) {
+      vm.arrivalValue = value
+      await vm.saveEstimatedArrival()
+      expect(vm.arrivalError?.message).toBeTruthy()
+    }
+    expect(updateOceanBookingEstimatedArrival).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
   beforeEach(() => {
     routeState.name = 'ocean-booking-detail'; routeState.params.bookingId = '123'
     vi.clearAllMocks()

src/modules/ocean-bookings/pages/OceanBookingDetailView.test.ts

@@ -70,7 +70,7 @@ describe('OceanBookingDetailView draft and release contract', () => {
     expect(source).toContain('if (!saved) return')
     expect(source).toContain("{{ form.data.billOfLadingNo || '—' }}")
     expect(source).not.toContain("{{ detail?.billOfLadingNo || '—' }}")
-    expect(source).toContain('const workflowBusy = computed(() => saving.value || actionSaving.value || actualSaving.value)')
+    expect(source).toContain('const workflowBusy = computed(() => saving.value || actionSaving.value || actualSaving.value || arrivalSaving.value)')
     expect(source).toContain(':disabled="workflowBusy" @click="openReleaseDialog"')
     expect(source).not.toContain('releaseReason')
     expect(source).toContain('放舱前请上传有效的订舱确认文件或提单文件')

src/modules/ocean-bookings/pages/OceanBookingDetailView.vue

@@ -30,6 +30,7 @@ import {
   listWarehouseLogisticsChannels,
   updateOceanBookingDraft,
   updateOceanBookingActualCargo,
+  updateOceanBookingEstimatedArrival,
   type OceanLogisticsChannel,
 } from '../api/platformOceanBookings'
 import type {
@@ -115,9 +116,14 @@ const canPrint = computed(() => !!detail.value && access.can('platform:firstleg:
 const canManageDocuments = computed(() => detail.value?.status === 'DRAFT' && access.can('platform:firstleg:ocean-booking:edit'))
 const documentManageReason = computed(() => !access.can('platform:firstleg:ocean-booking:edit') ? '暂无订舱资料维护权限' : '')
 const actualSaving = ref(false)
+const arrivalDialogOpen = ref(false)
+const arrivalSaving = ref(false)
+const arrivalValue = ref<string | null>(null)
+const arrivalError = ref<ApiErrorDetails | null>(null)
+const canMaintainArrival = computed(() => detail.value?.status === 'RELEASED' && access.can('platform:firstleg:ocean-booking:edit'))
 const actualReason = ref('')
 const cargoWritable = computed(() => formWritable.value || (detail.value?.status === 'RELEASED' && access.can('platform:firstleg:ocean-booking:edit')))
-const workflowBusy = computed(() => saving.value || actionSaving.value || actualSaving.value)
+const workflowBusy = computed(() => saving.value || actionSaving.value || actualSaving.value || arrivalSaving.value)
 const releaseDialogOpen = ref(false)
 const operationSections = ref<string[]>([])
 const printOpen = ref(false)
@@ -128,7 +134,7 @@ function statusLabel(status: OceanBookingStatus | string | null | undefined) {
   return oceanBookingStatusLabel(status)
 }
 function historyActionLabel(action: string) {
-  const labels: Record<string, string> = { CREATE: '创建草稿', UPDATE_DRAFT: '编辑草稿', RELEASE: '确认放舱', UPDATE_ACTUAL_CARGO: '实货量补录/修正', UPLOAD_DOCUMENT: '上传文件', ATTACH_DOCUMENT: '关联文件', INVALIDATE_DOCUMENT: '作废文件' }
+  const labels: Record<string, string> = { CREATE: '创建草稿', UPDATE_DRAFT: '编辑草稿', RELEASE: '确认放舱', UPDATE_ESTIMATED_ARRIVAL: '维护预计到港', UPDATE_ACTUAL_CARGO: '实货量补录/修正', UPLOAD_DOCUMENT: '上传文件', ATTACH_DOCUMENT: '关联文件', INVALIDATE_DOCUMENT: '作废文件' }
   return labels[action] || '资料维护'
 }
 async function loadOptions() {
@@ -185,6 +191,35 @@ function openPrint(type: OceanBookingPrintType) {
   printType.value = type
   printOpen.value = true
 }
+function openArrivalDialog() {
+  if (!canMaintainArrival.value || workflowBusy.value) return
+  arrivalValue.value = detail.value?.estimatedArrivalAt || null
+  arrivalError.value = null
+  arrivalDialogOpen.value = true
+}
+async function saveEstimatedArrival() {
+  const current = detail.value
+  if (!current || !canMaintainArrival.value || workflowBusy.value) return
+  if (!arrivalValue.value || (current.estimatedSailingAt && arrivalValue.value < current.estimatedSailingAt)) {
+    arrivalError.value = { message: !arrivalValue.value ? '请选择预计到港时间' : '预计到港时间不能早于预计开船时间' }
+    return
+  }
+  arrivalSaving.value = true
+  arrivalError.value = null
+  try {
+    const saved = await updateOceanBookingEstimatedArrival(current.id, { expectedVersion: current.version, estimatedArrivalAt: arrivalValue.value })
+    // 单独保存预计到港不丢弃客服尚未提交的实际货量。
+    const pendingCargo = { actualPackageCount: form.data.actualPackageCount, actualGrossWeightKg: form.data.actualGrossWeightKg, actualVolumeCbm: form.data.actualVolumeCbm }
+    const pendingReason = actualReason.value
+    applyDetail(saved)
+    Object.assign(form.data, pendingCargo)
+    actualReason.value = pendingReason
+    workspace.bumpCacheEpoch('ocean-bookings')
+    arrivalDialogOpen.value = false
+    ElMessage.success('预计到港已保存')
+  } catch (cause) { arrivalError.value = getApiErrorDetails(cause, '预计到港保存失败') }
+  finally { arrivalSaving.value = false }
+}
 async function saveActualCargo() {
   if (detail.value?.status !== 'RELEASED' || !cargoWritable.value || workflowBusy.value) return
   const validationError = cargoValidationError()
@@ -451,6 +486,7 @@ onMounted(() => { void load(); void loadOptions() })
                 <StatusBadge v-if="detail" :status="statusLabel(detail.status)" />
                 <el-button v-if="canDelete" type="danger" plain :loading="actionSaving" :disabled="workflowBusy" @click="removeDraft"><Trash2 :size="16" />删除草稿</el-button>
                 <el-button v-if="canSave" plain :loading="saving" :disabled="workflowBusy" @click="save"><Save :size="16" />保存草稿</el-button>
+                <el-button v-if="canMaintainArrival" plain :disabled="workflowBusy" @click="openArrivalDialog">维护预计到港</el-button>
               </div>
             </template>
           </PageToolbar>
@@ -614,6 +650,10 @@ onMounted(() => { void load(); void loadOptions() })
       </section>
       </template>
     </DetailPageLayout>
+    <AppDialog v-if="detail?.status === 'RELEASED'" v-model="arrivalDialogOpen" class="admin-density-dialog admin-workbench is-dialog" :title="bookingDialogTitle('维护预计到港')" width="560px" :confirm-loading="arrivalSaving" :confirm-disabled="!canMaintainArrival" confirm-text="保存" @confirm="saveEstimatedArrival">
+      <el-form class="density-form" label-position="top"><el-form-item label="预计到港" required><el-date-picker v-model="arrivalValue" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计到港时间" style="width:100%" /></el-form-item></el-form>
+      <LoadErrorState v-if="arrivalError" compact title="预计到港保存失败" :message="arrivalError.message" :show-retry="false"><template #details><ApiErrorMeta :details="arrivalError" /></template></LoadErrorState>
+    </AppDialog>
     <OceanBookingPrintDialog v-if="detail" v-model="printOpen" :booking-id="detail.id" :booking-no="detail.bookingNo" :allowed="canPrint" :initial-type="printType" @previewed="onPrintPreviewed" />
 
     <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="releaseDialogOpen" :title="bookingDialogTitle('确认放舱')" width="min(560px, 94vw)" :confirm-loading="actionSaving" :confirm-disabled="workflowBusy" confirm-text="确认放舱" cancel-text="取消" @confirm="submitRelease">