优化

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

@@ -18,6 +18,7 @@ import {
 import type { ContainerBookingResource, SmartLoadingCandidate, SmartLoadingPlan } from '../types'
 import { groupSmartLoadingItems, type SmartLoadingInboundItem } from '../smartLoadingItems'
 import { loadSmartLoadingPlanCoLoadGroups, type SmartLoadingPlanCoLoadGroup } from '../smartLoadingPlanGroups'
+import { resolveSmartLoadingChannelGroup } from '../smartLoadingChannelGroups'
 
 const route = useRoute()
 const router = useRouter()
@@ -43,7 +44,7 @@ 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)))
-type SmartLoadingCandidateRow = SmartLoadingCandidate & { sourceCandidates: SmartLoadingCandidate[]; memberInboundCodes: string[]; memberOrderSummaries: string[]; memberOrderCount: number; inboundFragmentCount: number }
+type SmartLoadingCandidateRow = SmartLoadingCandidate & { memberInboundIds: string[]; memberInboundCodes: string[]; memberOrderSummaries: string[]; memberOrderCount: number; inboundFragmentCount: number }
 function memberOrderSummaries<T extends { orderId: string; orderNo?: string | null; inboundCode?: string | null }>(members: T[]) {
   const orders = new Map<string, { label: string; inboundCodes: string[] }>()
   for (const member of members) {
@@ -60,32 +61,19 @@ function groupMemberLabel(group: SmartLoadingPlanCoLoadGroup) {
     : `${group.memberOrderCount} 票 · ${group.inboundFragmentCount} 个入仓片段`
 }
 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 || '入仓码暂缺'], memberOrderSummaries: memberOrderSummaries([candidate]), memberOrderCount: 1, inboundFragmentCount: 1 })
-      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,
+  return candidates.value.map((candidate) => {
+    const members: Array<{ inboundId: string; orderId: string; orderNo?: string | null; inboundCode?: string | null }> = candidate.groupMembers.length
+      ? candidate.groupMembers
+      : [candidate]
+    return {
+      ...candidate,
+      memberInboundIds: members.map((member) => member.inboundId),
       memberInboundCodes: members.map((member) => member.inboundCode || '入仓码暂缺'),
       memberOrderSummaries: memberOrderSummaries(members),
       memberOrderCount: new Set(members.map((member) => member.orderId)).size,
-      inboundFragmentCount: Number(first.memberCount || members.length),
-    })
-  }
-  return rows
+      inboundFragmentCount: Number(candidate.memberCount || members.length),
+    }
+  })
 })
 type SmartLoadingPlanRow = SmartLoadingInboundItem & { coLoadGroup: SmartLoadingPlanCoLoadGroup | null; memberInboundCodes: string[]; memberOrderSummaries: string[] }
 const displayedPlanItems = computed<SmartLoadingPlanRow[]>(() => {
@@ -207,8 +195,9 @@ async function load() {
       if (detail.code === 'A0404') { plan.value = null; noDraft.value = true }
       else throw error
     }
-    candidates.value = plan.value?.canAssign
-      ? await listSmartLoadingCandidates(container.value.id, container.value.warehouseId)
+    const channelGroup = resolveSmartLoadingChannelGroup(container.value.channelCode, container.value.channelName)
+    candidates.value = plan.value?.canAssign && channelGroup
+      ? (await listSmartLoadingCandidates({ channelGroupCodes: [channelGroup.code], warehouseId: container.value.warehouseId, page: 1, size: 200 })).records
       : []
   } catch (error) { loadError.value = getApiErrorDetails(error, '智能排柜工作台加载失败') }
   finally { loading.value = false }
@@ -245,7 +234,7 @@ async function assign() {
 }
 function candidateBlocked(candidate: SmartLoadingCandidateRow) {
   return Boolean(candidate.blockReason) || candidate.locked === true
-    || candidate.sourceCandidates.some((member) => assignedInboundIds.value.has(member.inboundId))
+    || candidate.memberInboundIds.some((inboundId) => assignedInboundIds.value.has(inboundId))
     || candidate.availablePackageCount < 1
 }
 async function recommend() {