feat(admin): support indivisible coload groups

2026-08-29 10:57:01 +08:00
parent aee562d998
commit 1aa2dfcdff
13 changed files with 621 additions and 38 deletions
@@ -4,6 +4,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { ArrowLeft, ListChecks, Plus, RefreshCw, Save, Sparkles, Trash2, Upload } from '@lucide/vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { batchQueryPlatformCoLoadGroups, type CoLoadGroup } from '@/modules/unified-orders'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
@@ -11,9 +12,9 @@ import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.v
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import {
-  adjustSmartLoadingItem, assignSmartLoadingItem, createSmartLoadingPlan, getContainer,
+  adjustSmartLoadingItem, assignSmartLoadingGroup, assignSmartLoadingItem, createSmartLoadingPlan, getContainer,
  getSmartLoadingPlanByBooking, listSmartLoadingCandidates, pushSmartLoadingPreload,
-  recommendSmartLoading, removeSmartLoadingItem,
+  recommendSmartLoading, removeSmartLoadingGroup, removeSmartLoadingItem,
 } from '../api/platformContainerLoading'
 import type { ContainerBookingResource, SmartLoadingCandidate, SmartLoadingPlan } from '../types'
 import { groupSmartLoadingItems, type SmartLoadingInboundItem } from '../smartLoadingItems'
@@ -34,6 +35,7 @@ const assignOpen = ref(false)
 const selectedCandidate = ref<SmartLoadingCandidate | null>(null)
 const assignForm = reactive({ packageCount: 1 })
 const quantityDrafts = reactive<Record<string, number>>({})
+const planGroupsByInboundId = ref(new Map<string, CoLoadGroup>())

 const canCreate = computed(() => access.can('platform:firstleg:smart-loading:create'))
 const canAssign = computed(() => access.can('platform:firstleg:smart-loading:assign'))
@@ -43,7 +45,71 @@ const canViewLoadingList = computed(() => access.can('platform:firstleg:loading-
 const editable = computed(() => plan.value?.canEdit === true)
 const assignable = computed(() => plan.value?.canAssign === true)
 const assignedInboundIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundId)))
-const displayedPlanItems = computed(() => groupSmartLoadingItems(plan.value?.items || []))
+type SmartLoadingCandidateRow = SmartLoadingCandidate & { sourceCandidates: SmartLoadingCandidate[]; memberInboundCodes: string[] }
+const displayedCandidates = computed<SmartLoadingCandidateRow[]>(() => {
+  const rows: SmartLoadingCandidateRow[] = []
+  const groups = new Map<string, SmartLoadingCandidate[]>()
+  for (const candidate of candidates.value) {
+    if (!candidate.coLoadGroupId) {
+      rows.push({ ...candidate, sourceCandidates: [candidate], memberInboundCodes: [candidate.inboundCode || '入仓码暂缺'] })
+      continue
+    }
+    groups.set(candidate.coLoadGroupId, [...(groups.get(candidate.coLoadGroupId) || []), candidate])
+  }
+  for (const members of groups.values()) {
+    const first = members[0]
+    rows.push({
+      ...first,
+      inboundCode: members.map((member) => member.inboundCode).filter(Boolean).join('、'),
+      customerName: [...new Set(members.map((member) => member.customerName).filter(Boolean))].join('、'),
+      goodsSummary: [...new Set(members.map((member) => member.goodsSummary).filter(Boolean))].join('、'),
+      availablePackageCount: first.groupTotalBoxes || members.reduce((sum, member) => sum + member.availablePackageCount, 0),
+      availableVolumeCbm: members.reduce((sum, member) => sum + Number(member.availableVolumeCbm || 0), 0),
+      sourceCandidates: members,
+      memberInboundCodes: members.map((member) => member.inboundCode || '入仓码暂缺'),
+    })
+  }
+  return rows
+})
+type SmartLoadingPlanRow = SmartLoadingInboundItem & { coLoadGroup: CoLoadGroup | null; memberInboundCodes: string[] }
+const displayedPlanItems = computed<SmartLoadingPlanRow[]>(() => {
+  const inboundRows = groupSmartLoadingItems(plan.value?.items || [])
+  const result: SmartLoadingPlanRow[] = []
+  const grouped = new Map<string, SmartLoadingInboundItem[]>()
+  for (const row of inboundRows) {
+    const group = planGroupsByInboundId.value.get(row.inboundId)
+    if (!group) {
+      result.push({ ...row, coLoadGroup: null, memberInboundCodes: [row.inboundCode || '入仓码暂缺'] })
+      continue
+    }
+    grouped.set(group.groupId, [...(grouped.get(group.groupId) || []), row])
+  }
+  for (const rows of grouped.values()) {
+    const first = rows[0]
+    const group = planGroupsByInboundId.value.get(first.inboundId)!
+    result.push({
+      ...first,
+      id: `coload:${group.groupId}`,
+      inboundCode: rows.map((row) => row.inboundCode).filter(Boolean).join('、'),
+      customerName: [...new Set(rows.map((row) => row.customerName).filter(Boolean))].join('、'),
+      skuCode: [...new Set(rows.map((row) => row.skuCode).filter(Boolean))].join('、'),
+      productNameZh: [...new Set(rows.map((row) => row.productNameZh).filter(Boolean))].join('、'),
+      packageCount: rows.reduce((sum, row) => sum + row.packageCount, 0),
+      productQuantity: rows.reduce((sum, row) => sum + Number(row.productQuantity || 0), 0),
+      grossWeightKg: rows.reduce((sum, row) => sum + Number(row.grossWeightKg || 0), 0),
+      volumeCbm: rows.reduce((sum, row) => sum + Number(row.volumeCbm || 0), 0),
+      pickedPackageCount: rows.reduce((sum, row) => sum + row.pickedPackageCount, 0),
+      minPackageCount: rows.reduce((sum, row) => sum + row.minPackageCount, 0),
+      canAdjust: false,
+      canRemove: rows.every((row) => row.canRemove),
+      sourceItems: rows.flatMap((row) => row.sourceItems),
+      detailCount: rows.reduce((sum, row) => sum + row.detailCount, 0),
+      coLoadGroup: group,
+      memberInboundCodes: rows.map((row) => row.inboundCode || '入仓码暂缺'),
+    })
+  }
+  return result
+})
 const totalVolume = computed(() => (plan.value?.items || []).reduce((sum, item) => sum + Number(item.volumeCbm || 0), 0))
 const totalWeight = computed(() => (plan.value?.items || []).reduce((sum, item) => sum + Number(item.grossWeightKg || 0), 0))
 const volumeLimit = computed(() => Number(container.value?.capacityCbm || 0) * 1.1)
@@ -57,6 +123,7 @@ const itemColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 180, fixed: 'left', slotName: 'actions' },
  { key: 'sequence', prop: 'loadSequence', label: '顺序', width: 75 },
  { key: 'order', label: '入仓码', minWidth: 190, slotName: 'order' },
+  { key: 'coLoadGroup', label: '同柜不可拆', minWidth: 210, slotName: 'coLoadGroup' },
  { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150 },
  { key: 'goods', label: '货物', minWidth: 190, slotName: 'goods' },
  { key: 'packageCount', label: '分配箱数', width: 150, slotName: 'packageCount' },
@@ -66,6 +133,7 @@ const itemColumns: DataTableColumn[] = [
 const candidateColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' },
  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 190, fixed: 'left', showOverflowTooltip: true },
+  { key: 'coLoadGroup', label: '同柜不可拆', minWidth: 210, slotName: 'coLoadGroup' },
  { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150 },
  { key: 'goodsSummary', prop: 'goodsSummary', label: '货物摘要', minWidth: 180, showOverflowTooltip: true },
  { key: 'availablePackageCount', prop: 'availablePackageCount', label: '可用箱数', width: 110 },
@@ -76,7 +144,7 @@ const candidateColumns: DataTableColumn[] = [

 function formatNumber(value: number, digits = 3) { return Number.isFinite(value) ? value.toLocaleString('zh-CN', { maximumFractionDigits: digits }) : '0' }
 function percentage(value: number) { return Number.isFinite(value) ? Number(Math.max(value, 0).toFixed(2)) : 0 }
-function candidateRow(source: object) { return source as SmartLoadingCandidate }
+function candidateRow(source: object) { return source as SmartLoadingCandidateRow }
 function itemRow(source: object) { return source as SmartLoadingInboundItem }
 function explainCandidate(source: object) {
  const candidate = candidateRow(source)
@@ -100,9 +168,20 @@ function syncDrafts(preserved: Record<string, number> = {}) {
  for (const item of displayedPlanItems.value) quantityDrafts[item.id] = preserved[item.id] ?? item.packageCount
 }
 function acceptPlan(next: SmartLoadingPlan, preserved: Record<string, number> = {}) { plan.value = next; noDraft.value = false; syncDrafts(preserved) }
+async function loadPlanGroups() {
+  planGroupsByInboundId.value = new Map()
+  const orderIds = [...new Set((plan.value?.items || []).map((item) => item.orderId))]
+  if (!orderIds.length || !canAssign.value) return
+  const groups = await batchQueryPlatformCoLoadGroups(orderIds)
+  const byInbound = new Map<string, CoLoadGroup>()
+  for (const info of groups) for (const member of info.group.members) byInbound.set(member.inboundId, info.group)
+  planGroupsByInboundId.value = byInbound
+  syncDrafts()
+}

 async function load() {
  loading.value = true; loadError.value = null; noDraft.value = false
+  planGroupsByInboundId.value = new Map()
  try {
    container.value = await getContainer(containerId.value)
    if (container.value.planStatus === 'COMPLETED') {
@@ -110,7 +189,7 @@ async function load() {
      candidates.value = []
      return
    }
-    try { acceptPlan(await getSmartLoadingPlanByBooking(containerId.value)) }
+    try { acceptPlan(await getSmartLoadingPlanByBooking(containerId.value)); await loadPlanGroups() }
    catch (error) {
      const detail = getApiErrorDetails(error)
      if (detail.code === 'A0404') { plan.value = null; noDraft.value = true }
@@ -136,17 +215,35 @@ async function createPlan() {
  catch (error) { await handleMutationError(error, '创建排柜计划失败') }
  finally { mutating.value = false }
 }
-function openAssign(source: object) { const candidate = candidateRow(source); selectedCandidate.value = candidate; assignForm.packageCount = Math.min(candidate.availablePackageCount, 1); assignOpen.value = true }
+function openAssign(source: object) {
+  const candidate = candidateRow(source)
+  if (candidateBlocked(candidate)) return
+  selectedCandidate.value = candidate
+  assignForm.packageCount = candidate.coLoadGroupId ? Number(candidate.groupTotalBoxes || candidate.availablePackageCount) : Math.min(candidate.availablePackageCount, 1)
+  assignOpen.value = true
+}
 async function assign() {
  if (!plan.value || !selectedCandidate.value || assignForm.packageCount < 1) return
+  if (selectedCandidate.value.coLoadGroupId && (selectedCandidate.value.blockReason || selectedCandidate.value.locked)) return
  mutating.value = true
  mutationError.value = null
  try {
-    acceptPlan(await assignSmartLoadingItem(plan.value.id, { inboundId: selectedCandidate.value.inboundId, packageCount: assignForm.packageCount, expectedVersion: plan.value.version }))
-    assignOpen.value = false; ElMessage.success('货物已分配')
+    const selected = selectedCandidate.value
+    const next = selected.coLoadGroupId
+      ? await assignSmartLoadingGroup(plan.value.id, selected.inboundId, plan.value.version)
+      : await assignSmartLoadingItem(plan.value.id, { inboundId: selected.inboundId, packageCount: assignForm.packageCount, expectedVersion: plan.value.version })
+    acceptPlan(next)
+    await loadPlanGroups()
+    assignOpen.value = false
+    ElMessage.success(selected.coLoadGroupId ? `同柜不可拆组 ${selected.groupNo} 已整组分配` : '货物已分配')
  } catch (error) { await handleMutationError(error, '分配失败') }
  finally { mutating.value = false }
 }
+function candidateBlocked(candidate: SmartLoadingCandidateRow) {
+  return Boolean(candidate.blockReason) || candidate.locked === true
+    || candidate.sourceCandidates.some((member) => assignedInboundIds.value.has(member.inboundId))
+    || candidate.availablePackageCount < 1
+}
 async function recommend() {
  if (!plan.value) return
  mutating.value = true
@@ -180,11 +277,21 @@ async function adjust(source: object) {
 async function remove(source: object) {
  const item = itemRow(source)
  if (!plan.value || !item.canRemove) return
-  await ElMessageBox.confirm(`确认从计划移除入仓码“${item.inboundCode || '—'}”的 ${item.packageCount} 箱吗？`, '移除装柜明细', { type: 'warning', confirmButtonText: '移除', cancelButtonText: '取消' }).catch(() => false).then(async (confirmed) => {
+  const row = source as SmartLoadingPlanRow
+  const message = row.coLoadGroup
+    ? `确认整组移除 ${row.coLoadGroup.groupNo}（${row.coLoadGroup.members.length} 票、${row.packageCount} 箱）吗？组内成员不能单独移除。`
+    : `确认从计划移除入仓码“${item.inboundCode || '—'}”的 ${item.packageCount} 箱吗？`
+  await ElMessageBox.confirm(message, row.coLoadGroup ? '移除同柜不可拆组' : '移除装柜明细', { type: 'warning', confirmButtonText: row.coLoadGroup ? '移除整组' : '移除', cancelButtonText: '取消' }).catch(() => false).then(async (confirmed) => {
    if (!confirmed || !plan.value) return
    mutating.value = true
    mutationError.value = null
    try {
+      if (row.coLoadGroup) {
+        acceptPlan(await removeSmartLoadingGroup(plan.value!.id, row.coLoadGroup.groupId, plan.value!.version))
+        await load()
+        ElMessage.success(`同柜不可拆组 ${row.coLoadGroup.groupNo} 已整组移除`)
+        return
+      }
      let current = plan.value!
      for (const original of item.sourceItems) {
        const currentItem = current.items.find((value) => value.id === original.id)
@@ -265,22 +372,24 @@ onMounted(load)
        <el-alert v-else-if="!plan.canEdit" :type="plan.finalCompletionStatus === 'COMPLETED' ? 'success' : 'info'" :closable="false" show-icon :title="plan.finalCompletionStatus === 'IN_PROGRESS' ? '正在最终确认，装柜方案暂时只读' : plan.finalCompletionStatus === 'COMPLETED' ? '装柜已完成，方案永久只读' : '当前装柜方案只读'" :description="plan.blockedReason || '请刷新计划获取最新作业状态。'" />
        <DataTable :data="displayedPlanItems" :columns="itemColumns" :loading="loading || mutating" stripe preference-key="smart-loading-items" column-settings-mode="hide" empty-text="暂无已分配货物">
          <template #toolbar-start><div><h2>{{ displayContainerNo(container) }} 装柜方案</h2><p>智能建议必须经人工核对。</p></div></template>
-          <template #actions="{ row }"><div class="row-actions"><el-button v-if="canAssign && editable && row.canAdjust" size="small" type="primary" plain :disabled="quantityDrafts[row.id] === row.packageCount" @click="adjust(row)"><Save :size="15" />保存箱数</el-button><el-button v-if="canDelete && editable && row.canRemove" size="small" type="danger" plain @click="remove(row)"><Trash2 :size="15" />移除整票</el-button><small v-if="row.detailCount > 1 && editable">含 {{ row.detailCount }} 个规格；改箱数请移除后重加</small><small v-if="row.pickedPackageCount > 0">已拣 {{ row.pickedPackageCount }} 箱</small></div></template>
+          <template #actions="{ row }"><div class="row-actions"><el-button v-if="canAssign && editable && row.canAdjust && !row.coLoadGroup" size="small" type="primary" plain :disabled="quantityDrafts[row.id] === row.packageCount" @click="adjust(row)"><Save :size="15" />保存箱数</el-button><el-button v-if="canDelete && editable && row.canRemove" size="small" type="danger" plain @click="remove(row)"><Trash2 :size="15" />{{ row.coLoadGroup ? '移除整组' : '移除整票' }}</el-button><small v-if="row.coLoadGroup">整组固定全箱数，不允许单票调整</small><small v-else-if="row.detailCount > 1 && editable">含 {{ row.detailCount }} 个规格；改箱数请移除后重加</small><small v-if="row.pickedPackageCount > 0">已拣 {{ row.pickedPackageCount }} 箱</small></div></template>
          <template #order="{ row }"><strong>{{ row.inboundCode || '—' }}</strong></template>
+          <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroup" class="candidate-group"><el-tag size="small" type="warning">{{ row.coLoadGroup.groupNo }} · {{ row.coLoadGroup.members.length }} 票</el-tag><span>全部成员联动，固定 {{ row.coLoadGroup.fullPackageCount }} 箱</span></div><span v-else>普通单票</span></template>
          <template #goods="{ row }"><strong>{{ row.productNameZh || '未命名货物' }}</strong><small>{{ row.skuCode || '无 SKU' }}</small></template>
-          <template #packageCount="{ row }"><div class="package-count-editor"><el-input-number v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :step="1" :disabled="!canAssign || !editable || !row.canAdjust" controls-position="right" /></div></template>
+          <template #packageCount="{ row }"><strong v-if="row.coLoadGroup">{{ row.packageCount }} 箱（整组固定）</strong><div v-else class="package-count-editor"><el-input-number v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :step="1" :disabled="!canAssign || !editable || !row.canAdjust" controls-position="right" /></div></template>
          <template #volume="{ row }">{{ formatNumber(Number(row.volumeCbm || 0)) }} m³</template><template #weight="{ row }">{{ formatNumber(Number(row.grossWeightKg || 0),1) }} kg</template>
        </DataTable>
-        <DataTable :data="candidates" :columns="candidateColumns" :loading="loading || mutating" stripe preference-key="smart-loading-candidates" column-settings-mode="hide" empty-text="当前仓库暂无可排柜货物">
+        <DataTable :data="displayedCandidates" :columns="candidateColumns" :loading="loading || mutating" stripe preference-key="smart-loading-candidates" column-settings-mode="hide" empty-text="当前仓库暂无可排柜货物">
          <template #toolbar-start><div><h2>候选货物</h2><p>系统基于装柜仓库、物流渠道、可用箱数及 110% 容量上限校验。</p></div></template>
-          <template #actions="{ row }"><el-button v-if="canAssign && assignable" size="small" type="primary" plain :disabled="assignedInboundIds.has(row.inboundId) || row.availablePackageCount < 1" @click="openAssign(row)"><Plus :size="15" />分配</el-button></template>
+          <template #actions="{ row }"><el-button v-if="canAssign && assignable" size="small" type="primary" plain :disabled="candidateBlocked(row as SmartLoadingCandidateRow)" @click="openAssign(row)"><Plus :size="15" />{{ row.coLoadGroupId ? '整组分配' : '分配' }}</el-button></template>
+          <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroupId" class="candidate-group"><el-tag size="small" type="warning">{{ row.groupNo }} · {{ row.memberCount }} 票</el-tag><span>整组 {{ row.groupTotalBoxes }} 箱，必须全量进入同一柜</span><small v-if="row.blockReason" class="candidate-block">{{ row.blockReason }}</small><small v-else-if="row.locked">该组已锁定，不能重复分配</small></div><span v-else>普通单票</span></template>
          <template #averageUnitVolume="{ row }">{{ formatNumber(Number(row.averageUnitVolumeCbm || 0)) }} m³</template><template #unitGrossWeight="{ row }">{{ formatNumber(Number(row.unitGrossWeightKg || 0),1) }} kg</template>
          <template #cartonIdentityStatus><el-tag size="small" type="info" effect="plain">未核验</el-tag></template>
        </DataTable>
      </template>
      </template>
    </template>
-    <AppDialog v-model="assignOpen" title="按入仓码分配箱数" :confirm-loading="mutating" confirm-text="确认分配" @confirm="assign"><div v-if="selectedCandidate" class="assign-dialog"><p><strong>{{ selectedCandidate.inboundCode || '入仓码暂缺' }}</strong></p><p>{{ selectedCandidate.goodsSummary || '货物摘要暂缺' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱</p><el-form label-position="top"><el-form-item label="本次计划装柜箱数" required><el-input-number v-model="assignForm.packageCount" :min="1" :max="selectedCandidate.availablePackageCount" :step="1" controls-position="right" /></el-form-item></el-form><el-alert :title="explainCandidate(selectedCandidate)" type="info" :closable="false" /><small>只记录数量，具体上柜箱号未核验。</small></div></AppDialog>
+    <AppDialog v-model="assignOpen" :title="selectedCandidate?.coLoadGroupId ? '整组加入当前柜次' : '按入仓码分配箱数'" :confirm-loading="mutating" :confirm-disabled="Boolean(selectedCandidate?.blockReason || selectedCandidate?.locked)" :confirm-text="selectedCandidate?.coLoadGroupId ? '确认整组分配' : '确认分配'" @confirm="assign"><div v-if="selectedCandidate" class="assign-dialog"><p><strong>{{ selectedCandidate.groupNo || selectedCandidate.inboundCode || '入仓码暂缺' }}</strong></p><template v-if="selectedCandidate.coLoadGroupId"><p>组内 {{ selectedCandidate.memberCount }} 票，共 {{ selectedCandidate.groupTotalBoxes }} 箱</p><el-alert :title="selectedCandidate.blockReason || '同柜且不可拆：全部成员按完整箱数一次加入，不能部分输入或单独移除。'" :type="selectedCandidate.blockReason ? 'error' : 'warning'" :closable="false" /></template><template v-else><p>{{ selectedCandidate.goodsSummary || '货物摘要暂缺' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱</p><el-form label-position="top"><el-form-item label="本次计划装柜箱数" required><el-input-number v-model="assignForm.packageCount" :min="1" :max="selectedCandidate.availablePackageCount" :step="1" controls-position="right" /></el-form-item></el-form><el-alert :title="explainCandidate(selectedCandidate)" type="info" :closable="false" /><small>只记录数量，具体上柜箱号未核验。</small></template></div></AppDialog>
  </section>
  </AdminPage>
 </template>
@@ -310,5 +419,8 @@ onMounted(load)
 .workbench :deep(.package-count-editor .el-input-number) { width: 100%; min-width: 0; }
 .assign-dialog p { margin: 0 0 10px; }
 .assign-dialog :deep(.el-input-number) { width: 100%; }
+.candidate-group { display: grid; width: fit-content; gap: 3px; }
+.candidate-group > span,.candidate-group > small { color: var(--cc-muted); font-size: 11px; }
+.candidate-group .candidate-block { color: var(--el-color-danger); }
@media (max-width: 760px) { .workbench-command-bar,.header-actions { width: 100%; flex-direction: column; align-items: stretch; } .workbench-identities { flex-direction: column; align-items: stretch; gap: 10px; } .summary-band,.capacity-grid { grid-template-columns: 1fr; } .meter-title { align-items: flex-start; flex-direction: column; } .header-actions .el-button { min-height: 44px; margin-left: 0; } }
 </style>