优化

2026-08-18 16:09:43 +08:00
parent f9ae2d94cb
commit 21249d1dde
52 changed files with 980 additions and 698 deletions
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
-import { Boxes, Check, Eye, FileText, FileUp, Link2, ListChecks, MoreHorizontal, Pencil, Plus, Sparkles, TriangleAlert, Unlink } from '@lucide/vue'
+import { Boxes, Check, Eye, FileText, FileUp, Link2, ListChecks, MoreHorizontal, Pencil, Plus, Sparkles, TriangleAlert } from '@lucide/vue'
 import { ElMessage, type FormInstance, type FormRules, type UploadFile } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
@@ -20,7 +20,7 @@ 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 ContainerOverviewPanel from '../components/ContainerOverviewPanel.vue'
-import { cancelContainerException, completeContainerClearance, createContainerSimulation, downloadContainerDocument, downloadContainerPdaPhoto, getContainer, getContainerClearance, getContainerOverview, linkContainerOceanBooking, listContainers, markContainerException, unlinkContainerOceanBooking, updateContainer, updateContainerTransport, uploadContainerClearance, uploadContainerDocument } from '../api/platformContainerLoading'
+import { cancelContainerException, completeContainerClearance, createContainerSimulation, downloadContainerDocument, downloadContainerPdaPhoto, getContainer, getContainerClearance, getContainerOverview, linkContainerOceanBooking, listContainers, markContainerException, updateContainer, updateContainerTransport, uploadContainerClearance, uploadContainerDocument } from '../api/platformContainerLoading'
 import type { ContainerBookingResource, ContainerDocumentStatus, ContainerDocumentType, ContainerOverview, ContainerOverviewDocument, ContainerPdaPhoto, ContainerPlanStatus, ContainerSaveRequest, ContainerSimulationCreateRequest } from '../types'

 type Filters = QueryModel & { customerId: string; keyword: string; containerType: string; status: ContainerPlanStatus | ''; sailingRange: string[] }
@@ -89,10 +89,9 @@ const linkSaving = ref(false)
 const linkError = ref<ApiErrorDetails | null>(null)
 const linkTarget = ref<ContainerBookingResource | null>(null)
 const linkCandidateKey = ref('')
-const linkCandidates = ref<Array<{ key: string; realContainerBookingId: string; label: string }>>([])
+const linkContainerNo = ref('')
+const linkCandidates = ref<Array<{ key: string; oceanBookingId: string; requirementId: string; label: string; disabled: boolean }>>([])
 const selectedTruckingSupplierId = ref('')
-const unlinkOpen = ref(false)
-const unlinkReason = ref('')
 let listSequence = 0
 let detailSequence = 0

@@ -353,71 +352,60 @@ async function saveSimulation() {
  } catch (error) { simulationError.value = getApiErrorDetails(error, '模拟柜创建失败') }
  finally { simulationSaving.value = false }
 }
-async function loadBookingStatus(status: 'CONFIRMED' | 'RELEASED') {
-  const first = await listOceanBookings({ page: 1, size: 200, status })
+async function loadReleasedBookings() {
+  const first = await listOceanBookings({ page: 1, size: 200, status: 'RELEASED' })
  if (first.pages <= 1) return first.records
-  const rest = await Promise.all(Array.from({ length: first.pages - 1 }, (_, index) => listOceanBookings({ page: index + 2, size: 200, status })))
+  const rest = await Promise.all(Array.from({ length: first.pages - 1 }, (_, index) => listOceanBookings({ page: index + 2, size: 200, status: 'RELEASED' })))
  return [first, ...rest].flatMap((result) => result.records)
 }
 async function openLink(source: object) {
  const row = source as ContainerBookingResource
  linkTarget.value = row
  linkCandidateKey.value = ''
+  linkContainerNo.value = ''
  linkCandidates.value = []
  linkError.value = null
  linkOpen.value = true
  linkLoading.value = true
  try {
-    const bookings = (await Promise.all([loadBookingStatus('CONFIRMED'), loadBookingStatus('RELEASED')])).flat()
-      .filter((booking) => booking.warehouseId === row.warehouseId && booking.channelCode === row.channelCode)
+    const bookings = await loadReleasedBookings()
    const details = await Promise.all(bookings.map((booking) => getOceanBooking(booking.id)))
-    linkCandidates.value = details.flatMap((booking) => booking.containers
-      .filter((container) => container.warehouseId === row.warehouseId
-        && container.channelCode === row.channelCode
-        && container.containerType === row.containerType
-        && Number(container.capacityCbm) === Number(row.capacityCbm)
-        && Number(container.maxWeightKg) === Number(row.maxWeightKg))
-      .map((container) => ({
-        key: container.containerBookingId,
-        realContainerBookingId: container.containerBookingId,
-        label: `${booking.bookingNo || '订舱号待补'} · 集装箱号 ${container.containerNo} · 柜次号 ${container.cabinetNo} · ${container.containerType}`,
-      })))
-  } catch (error) { linkError.value = getApiErrorDetails(error, '真实订舱柜候选加载失败') }
+    linkCandidates.value = details.flatMap((booking) => booking.containerRequirements
+      .map((requirement) => ({ ...requirement, remainingQuantity: Math.max(0, Number(requirement.quantity) - booking.containers.filter((container) => container.requirementId === requirement.requirementId).length) }))
+      .filter((requirement) => Boolean(requirement.requirementId) && Number(requirement.remainingQuantity) > 0)
+      .map((requirement) => {
+        const specificationMatches = booking.warehouseId === row.warehouseId
+          && booking.channelCode === row.channelCode
+          && requirement.containerType === row.containerType
+          && Number(requirement.capacityCbm) === Number(row.capacityCbm)
+          && Number(requirement.maxWeightKg) === Number(row.maxWeightKg)
+        return {
+          key: `${booking.id}:${requirement.requirementId}`,
+          oceanBookingId: booking.id,
+          requirementId: String(requirement.requirementId),
+          disabled: !specificationMatches,
+          label: `${booking.bookingNo || '订舱号待补'} · ${requirement.containerType} × ${requirement.remainingQuantity} · ${booking.customerName || '未关联客户'} · ${booking.warehouseName || '仓库待补'} · ${booking.channelName || '渠道待补'}${specificationMatches ? '' : '（与当前柜规格不一致）'}`,
+        }
+      }))
+  } catch (error) { linkError.value = getApiErrorDetails(error, '已放舱订舱候选加载失败') }
  finally { linkLoading.value = false }
 }
 async function saveLink() {
  const target = linkTarget.value
  const candidate = linkCandidates.value.find((item) => item.key === linkCandidateKey.value)
-  if (!target || !candidate) { linkError.value = { message: '请选择要关联的真实订舱柜' }; return }
+  const containerNo = linkContainerNo.value.trim()
+  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, { realContainerBookingId: candidate.realContainerBookingId, expectedVersion: target.version })
+    await linkContainerOceanBooking(target.id, { oceanBookingId: candidate.oceanBookingId, requirementId: candidate.requirementId, containerNo, expectedVersion: target.version })
    linkOpen.value = false
-    ElMessage.success('已关联真实订舱柜，柜次号与装柜明细保持不变')
+    ElMessage.success('订舱与真实集装箱号已关联，柜次号、装柜计划和明细保持不变')
    await loadRows()
  } catch (error) { linkError.value = getApiErrorDetails(error, '关联真实订舱柜失败') }
  finally { linkSaving.value = false }
 }
-function openUnlink(source: object) {
-  linkTarget.value = source as ContainerBookingResource
-  unlinkReason.value = ''
-  linkError.value = null
-  unlinkOpen.value = true
-}
-async function saveUnlink() {
-  const target = linkTarget.value
-  if (!target || !unlinkReason.value.trim()) { linkError.value = { message: '请输入解除关联原因' }; return }
-  linkSaving.value = true
-  linkError.value = null
-  try {
-    await unlinkContainerOceanBooking(target.id, target.version, unlinkReason.value.trim())
-    unlinkOpen.value = false
-    ElMessage.success('真实订舱关联已解除，柜次号保持不变')
-    await loadRows()
-  } catch (error) { linkError.value = getApiErrorDetails(error, '解除真实订舱关联失败') }
-  finally { linkSaving.value = false }
-}
 async function loadRows() {
  const sequence = ++listSequence
  loading.value = true; loadError.value = null
@@ -449,7 +437,6 @@ async function openDetail(source: object) {
 function handleMoreAction(command: string, source: object) {
  const row = source as ContainerBookingResource
  if (command === 'link') { void openLink(row); return }
-  if (command === 'unlink') { openUnlink(row); return }
  if (command === 'overview') { void openDetail(row); return }
  detailTarget.value = row
  void openDetail(row).then(() => {
@@ -603,7 +590,7 @@ onMounted(() => { void Promise.all([loadCustomers(), loadWarehouses(), loadBusin
        <section v-if="!loadError" class="surface-panel table-panel">
          <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 && row.planStatus !== 'COMPLETED'" size="small" @click="openEdit(row)"><Pencil :size="15" />{{ row.planStatus === 'LOADING' ? (row.containerNo ? '修改集装箱号' : '录入集装箱号') : '编辑运输信息' }}</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.recordStatus === 'ACTIVE' && !row.oceanBookingId && ['WAIT_LOADING','EDITING'].includes(row.planStatus)" command="link"><Link2 :size="15" />关联真实订舱柜</el-dropdown-item><el-dropdown-item v-if="canEdit && row.sourceType === 'SIMULATION' && row.recordStatus === 'ACTIVE' && row.oceanBookingId && row.planStatus === 'WAIT_LOADING'" command="unlink"><Unlink :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 && row.planStatus !== 'COMPLETED'" size="small" @click="openEdit(row)"><Pencil :size="15" />{{ row.planStatus === 'LOADING' ? (row.containerNo ? '修改集装箱号' : '录入集装箱号') : '编辑运输信息' }}</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>
@@ -642,19 +629,13 @@ onMounted(() => { void Promise.all([loadCustomers(), loadWarehouses(), loadBusin
      <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(620px, 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" /></el-select></el-form-item></el-form>
-      <p class="dialog-hint">已预排货但尚未进入 PDA、取证或单证阶段的模拟柜仍可首次关联；最终状态门禁以后端为准。</p>
+    <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="请输入港口取得的真实集装箱号" /></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>

-    <AppDialog v-model="unlinkOpen" title="解除真实订舱关联" width="min(520px, calc(100vw - 28px))" confirm-text="确认解除" cancel-text="取消" :confirm-loading="linkSaving" :confirm-disabled="!unlinkReason.trim()" @confirm="saveUnlink">
-      <el-alert title="只有尚未排货的空柜可以解除；已有排货明细、PDA 或单证事实时服务端会拒绝。柜次号不会被删除。" type="warning" :closable="false" />
-      <el-form label-position="top"><el-form-item label="解除原因" required><el-input v-model="unlinkReason" type="textarea" :rows="3" maxlength="500" show-word-limit /></el-form-item></el-form>
-      <LoadErrorState v-if="linkError" compact title="解除关联失败" :message="linkError.message" :show-retry="false"><template #details><ApiErrorMeta :details="linkError" /></template></LoadErrorState>
-    </AppDialog>
-
    <AppDialog v-model="editorOpen" class="container-editor-dialog" :title="editorTitle" width="min(820px, calc(100vw - 28px))" :confirm-loading="saving" :confirm-disabled="Boolean(warehouseError && !transportOnly)" confirm-text="确定" cancel-text="关闭" @confirm="save">
      <LoadErrorState v-if="editorError" title="货柜保存失败" :message="editorError.message" compact :retry-text="form.id ? '刷新最新数据' : '重试保存'" @retry="form.id ? openEdit({ id: form.id }) : save()"><template #details><ApiErrorMeta :details="editorError" /></template></LoadErrorState>
      <el-alert v-if="transportOnly" title="拣货中仅允许修改集装箱号和航次，其他字段已锁定。" type="warning" :closable="false" />