优化

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

@@ -4,7 +4,6 @@ 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'
@@ -18,6 +17,7 @@ import {
 } from '../api/platformContainerLoading'
 import type { ContainerBookingResource, SmartLoadingCandidate, SmartLoadingPlan } from '../types'
 import { groupSmartLoadingItems, type SmartLoadingInboundItem } from '../smartLoadingItems'
+import { loadSmartLoadingPlanCoLoadGroups, type SmartLoadingPlanCoLoadGroup } from '../smartLoadingPlanGroups'
 
 const route = useRoute()
 const router = useRouter()
@@ -35,7 +35,7 @@ const assignOpen = ref(false)
 const selectedCandidate = ref<SmartLoadingCandidateRow | null>(null)
 const assignForm = reactive({ packageCount: 1 })
 const quantityDrafts = reactive<Record<string, number>>({})
-const planGroupsByInboundId = ref(new Map<string, CoLoadGroup>())
+const planGroupsByInboundId = ref(new Map<string, SmartLoadingPlanCoLoadGroup>())
 
 const canCreate = computed(() => access.can('platform:firstleg:smart-loading:create'))
 const canAssign = computed(() => access.can('platform:firstleg:smart-loading:assign'))
@@ -56,10 +56,10 @@ function memberOrderSummaries<T extends { orderId: string; orderNo?: string | nu
   }
   return [...orders.values()].map((order) => `${order.label}：${order.inboundCodes.join('、')}`)
 }
-function groupOrderCount(group: CoLoadGroup) { return new Set(group.members.map((member) => member.orderId)).size }
-function groupMemberLabel(group: CoLoadGroup) {
-  const orderCount = groupOrderCount(group)
-  return group.members.length === orderCount ? `${orderCount} 票` : `${orderCount} 票 · ${group.members.length} 个入仓片段`
+function groupMemberLabel(group: SmartLoadingPlanCoLoadGroup) {
+  return group.inboundFragmentCount === group.memberOrderCount
+    ? `${group.memberOrderCount} 票`
+    : `${group.memberOrderCount} 票 · ${group.inboundFragmentCount} 个入仓片段`
 }
 const displayedCandidates = computed<SmartLoadingCandidateRow[]>(() => {
   const rows: SmartLoadingCandidateRow[] = []
@@ -89,7 +89,7 @@ const displayedCandidates = computed<SmartLoadingCandidateRow[]>(() => {
   }
   return rows
 })
-type SmartLoadingPlanRow = SmartLoadingInboundItem & { coLoadGroup: CoLoadGroup | null; memberInboundCodes: string[]; memberOrderSummaries: string[] }
+type SmartLoadingPlanRow = SmartLoadingInboundItem & { coLoadGroup: SmartLoadingPlanCoLoadGroup | null; memberInboundCodes: string[]; memberOrderSummaries: string[] }
 const displayedPlanItems = computed<SmartLoadingPlanRow[]>(() => {
   const inboundRows = groupSmartLoadingItems(plan.value?.items || [])
   const result: SmartLoadingPlanRow[] = []
@@ -187,15 +187,10 @@ 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 acceptPlanWithGroups(next: SmartLoadingPlan, preserved: Record<string, number> = {}) {
+  acceptPlan(next, preserved)
+  planGroupsByInboundId.value = await loadSmartLoadingPlanCoLoadGroups(next)
+  syncDrafts(preserved)
 }
 
 async function load() {
@@ -208,7 +203,7 @@ async function load() {
       candidates.value = []
       return
     }
-    try { acceptPlan(await getSmartLoadingPlanByBooking(containerId.value)); await loadPlanGroups() }
+    try { await acceptPlanWithGroups(await getSmartLoadingPlanByBooking(containerId.value)) }
     catch (error) {
       const detail = getApiErrorDetails(error)
       if (detail.code === 'A0404') { plan.value = null; noDraft.value = true }
@@ -230,7 +225,7 @@ function openOperationalList() {
 async function createPlan() {
   mutating.value = true
   mutationError.value = null
-  try { acceptPlan(await createSmartLoadingPlan(containerId.value, null)); ElMessage.success('排柜计划已创建') }
+  try { await acceptPlanWithGroups(await createSmartLoadingPlan(containerId.value, null)); ElMessage.success('排柜计划已创建') }
   catch (error) { await handleMutationError(error, '创建排柜计划失败') }
   finally { mutating.value = false }
 }
@@ -251,8 +246,7 @@ async function assign() {
     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()
+    await acceptPlanWithGroups(next)
     assignOpen.value = false
     ElMessage.success(selected.coLoadGroupId ? `同柜不可拆组 ${selected.groupNo} 已整组分配` : '货物已分配')
   } catch (error) { await handleMutationError(error, '分配失败') }
@@ -269,13 +263,13 @@ async function recommend() {
   mutationError.value = null
   try {
     try {
-      acceptPlan(await recommendSmartLoading(plan.value.id, plan.value.version))
+      await acceptPlanWithGroups(await recommendSmartLoading(plan.value.id, plan.value.version))
     } catch (error) {
       const details = getApiErrorDetails(error, '智能推荐失败')
       if (details.code !== 'A0409' || !/(版本|并发|已被修改|已变化)/.test(details.message)) throw error
       await load()
       if (!plan.value) throw error
-      acceptPlan(await recommendSmartLoading(plan.value.id, plan.value.version))
+      await acceptPlanWithGroups(await recommendSmartLoading(plan.value.id, plan.value.version))
     }
     ElMessage.success('智能建议已生成，请人工核对后再推送')
   }
@@ -289,7 +283,7 @@ async function adjust(source: object) {
   if (!Number.isInteger(count) || count < item.minPackageCount) { ElMessage.warning(`分配箱数不能低于已拣下限 ${item.minPackageCount} 箱`); return }
   mutating.value = true
   mutationError.value = null
-  try { acceptPlan(await adjustSmartLoadingItem(plan.value.id, item.id, count, plan.value.version, item.version)); ElMessage.success('箱数已调整') }
+  try { await acceptPlanWithGroups(await adjustSmartLoadingItem(plan.value.id, item.id, count, plan.value.version, item.version)); ElMessage.success('箱数已调整') }
   catch (error) { await handleMutationError(error, '调整失败') }
   finally { mutating.value = false }
 }
@@ -306,7 +300,7 @@ async function remove(source: object) {
     mutationError.value = null
     try {
       if (row.coLoadGroup) {
-        acceptPlan(await removeSmartLoadingGroup(plan.value!.id, row.coLoadGroup.groupId, plan.value!.version))
+        await acceptPlanWithGroups(await removeSmartLoadingGroup(plan.value!.id, row.coLoadGroup.groupId, plan.value!.version))
         await load()
         ElMessage.success(`同柜不可拆组 ${row.coLoadGroup.groupNo} 已整组移除`)
         return
@@ -316,7 +310,7 @@ async function remove(source: object) {
         const currentItem = current.items.find((value) => value.id === original.id)
         if (!currentItem) continue
         current = await removeSmartLoadingItem(current.id, currentItem.id, current.version, currentItem.version)
-        acceptPlan(current)
+        await acceptPlanWithGroups(current)
       }
       await load()
       ElMessage.success('该入仓码已从装柜方案移除')
@@ -331,7 +325,7 @@ async function pushPreload() {
   if (!confirmed || !plan.value) return
   mutating.value = true
   mutationError.value = null
-  try { acceptPlan(await pushSmartLoadingPreload(plan.value.id, plan.value.version)); ElMessage.success('预装清单已生成，请继续完成集装箱号和预装确认') }
+  try { await acceptPlanWithGroups(await pushSmartLoadingPreload(plan.value.id, plan.value.version)); ElMessage.success('预装清单已生成，请继续完成集装箱号和预装确认') }
   catch (error) { await handleMutationError(error, '推送失败') }
   finally { mutating.value = false }
 }