优化

src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts

@@ -18,6 +18,7 @@ import {
   listSmartLoadingCandidates,
   listSmartLoadingWorkbenchContainers,
   recommendSmartLoading,
+  removeAllUnpickedSmartLoadingItems,
   removeSmartLoadingGroup,
   removeSmartLoadingItem,
 } from '../api/platformContainerLoading'
@@ -47,6 +48,7 @@ vi.mock('../api/platformContainerLoading', () => ({
   adjustSmartLoadingItem: vi.fn(),
   removeSmartLoadingItem: vi.fn(),
   removeSmartLoadingGroup: vi.fn(),
+  removeAllUnpickedSmartLoadingItems: vi.fn(),
   pushSmartLoadingPreload: vi.fn(),
 }))
 vi.mock('@/modules/warehouses', () => ({
@@ -453,7 +455,7 @@ describe('GlobalSmartLoadingView', () => {
     await flushPromises()
     expect(document.body.textContent).toContain('不能部分输入、单独分配或单独移除')
     expect(document.body.textContent).toContain('目标柜次：CB-1 · 集装箱号：MSCU-1')
-    expect(document.body.textContent).toContain('发货仓：义乌仓 · 渠道：美森正班')
+    expect(document.body.textContent).toContain('发货仓：义乌仓 · 柜次渠道：美森正班海卡包税')
     expect(document.body.textContent).not.toContain('本次分配箱数')
     ;([...document.body.querySelectorAll('button')].find((button) => button.textContent?.includes('确认整组分配')) as HTMLButtonElement).click()
     await flushPromises()
@@ -466,10 +468,12 @@ describe('GlobalSmartLoadingView', () => {
   it('allows a pending-review order to join through the provisional assignment command', async () => {
     vi.mocked(listSmartLoadingCandidates).mockResolvedValue(candidatePage([{
       ...candidate,
-      customerId: '1',
+      customerId: '',
       inboundId: null,
       orderStatusSnapshot: 'PENDING_REVIEW',
       inboundCode: 'EXXHK2609020361',
+      channelCode: 'SLOW',
+      channelName: '慢船',
       unitGrossWeightKg: null,
       averageUnitVolumeCbm: null,
       availableVolumeCbm: null,
@@ -488,6 +492,9 @@ describe('GlobalSmartLoadingView', () => {
     expect(document.body.textContent).toContain('平均单箱毛重 待测量')
     expect(document.body.textContent).toContain('平均单箱体积 待测量')
     expect(document.body.textContent).not.toContain('平均单箱毛重 0 kg')
+    expect(document.body.textContent).toContain('订单渠道：慢船')
+    expect(document.body.textContent).toContain('这是人工排柜，确认后仍会加入')
+    expect(document.body.textContent).toContain('智能推荐不会跨渠道')
     ;([...document.body.querySelectorAll('button')]
       .find((button) => button.textContent?.includes('确认加入')) as HTMLButtonElement).click()
     await flushPromises()
@@ -717,13 +724,12 @@ describe('GlobalSmartLoadingView', () => {
     expect(wrapper.text()).toContain('trace-remove-1')
   })
 
-  it('removes every item with the latest returned plan version', async () => {
+  it('removes every unpicked item with one bulk request', async () => {
     const secondItem = { ...plan.items[0], id: '102', inboundDetailId: '4', inboundCode: 'IN-2' }
     const initialPlan = { ...plan, items: [plan.items[0], secondItem] }
-    const afterFirst = { ...plan, version: 3, items: [secondItem] }
     const emptyPlan = { ...plan, version: 4, items: [] }
     vi.mocked(getSmartLoadingPlanByBooking).mockResolvedValueOnce(initialPlan).mockResolvedValue(emptyPlan)
-    vi.mocked(removeSmartLoadingItem).mockResolvedValueOnce(afterFirst).mockResolvedValueOnce(emptyPlan)
+    vi.mocked(removeAllUnpickedSmartLoadingItems).mockResolvedValueOnce(emptyPlan)
     vi.spyOn(ElMessageBox, 'confirm').mockResolvedValue('confirm' as never)
 
     const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
@@ -733,8 +739,9 @@ describe('GlobalSmartLoadingView', () => {
     await removeAllButton!.trigger('click')
     await flushPromises()
 
-    expect(removeSmartLoadingItem).toHaveBeenNthCalledWith(1, plan.id, plan.items[0].id, 2, 1)
-    expect(removeSmartLoadingItem).toHaveBeenNthCalledWith(2, plan.id, secondItem.id, 3, 1)
+    expect(removeAllUnpickedSmartLoadingItems).toHaveBeenCalledTimes(1)
+    expect(removeAllUnpickedSmartLoadingItems).toHaveBeenCalledWith(plan.id, 2)
+    expect(removeSmartLoadingItem).not.toHaveBeenCalled()
     expect(wrapper.text()).toContain('当前柜次暂无装柜明细')
   })
 

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

@@ -22,6 +22,7 @@ import {
   listSmartLoadingCandidates,
   listSmartLoadingWorkbenchContainers,
   recommendSmartLoading,
+  removeAllUnpickedSmartLoadingItems,
   removeSmartLoadingGroup,
   removeSmartLoadingItem,
 } from '../api/platformContainerLoading'
@@ -74,6 +75,11 @@ let containerRequest = 0
 const canAssign = computed(() => access.can('platform:firstleg:smart-loading:assign'))
 const canDelete = computed(() => access.can('platform:firstleg:smart-loading:delete'))
 const selectedContainer = computed(() => containers.value.find((item) => item.bookingId === selectedContainerId.value) || null)
+const crossChannelAssignment = computed(() => Boolean(
+  selectedCandidate.value?.channelCode
+  && selectedContainer.value?.channelCode
+  && selectedCandidate.value.channelCode !== selectedContainer.value.channelCode,
+))
 const orchestratableContainers = computed(() => containers.value)
 const completedContainerCount = computed(() => 0)
 const missingChannelContainerCount = computed(() => orchestratableContainers.value.filter((item) => !item.channelCode).length)
@@ -211,7 +217,7 @@ function preferredContainerId() {
 }
 
 const candidateColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 92, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
   { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true },
   { key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' },
   { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' },
@@ -224,13 +230,13 @@ const candidateColumns: DataTableColumn[] = [
   { key: 'totalVolumeCbm', label: '体积', width: 90, slotName: 'candidateTotalVolume' },
 ]
 const itemColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 80, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
   { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true },
   { key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' },
   { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' },
   { key: 'packageCount', label: '分配箱数', width: 100, slotName: 'packageCount' },
-  { key: 'grossWeightKg', label: '毛重', width: 80, slotName: 'weight' },
-  { key: 'volumeCbm', label: '体积', width: 80, slotName: 'volume' },
+  { key: 'grossWeightKg', label: '毛重', width: 90, slotName: 'weight' },
+  { key: 'volumeCbm', label: '体积', width: 90, slotName: 'volume' },
 ]
 
 function formatNumber(value: number, digits = 3) {
@@ -474,7 +480,7 @@ async function assign() {
     const selected = selectedCandidate.value!
     acceptPlan(selected.orderStatusSnapshot === 'PENDING_REVIEW'
       ? await assignPendingReviewSmartLoadingOrder(plan.value!.id, {
-        customerId: selected.customerId,
+        customerId: selected.accountId,
         orderId: selected.orderId,
         inboundCode: selected.inboundCode || '',
         packageCount: assignForm.packageCount,
@@ -495,7 +501,7 @@ async function assign() {
 function candidateBlocked(candidate: SmartLoadingCandidateRow) {
   if (candidate.orderStatusSnapshot === 'PENDING_REVIEW') {
     return Boolean(candidate.blockReason) || candidate.locked === true
-      || !candidate.inboundCode || candidate.availablePackageCount < 1
+      || !candidate.accountId || !candidate.inboundCode || candidate.availablePackageCount < 1
   }
   return Boolean(candidate.blockReason) || candidate.locked === true
     || !candidate.inboundId
@@ -572,20 +578,7 @@ async function removeAll() {
   }).catch(() => false)
   if (!confirmed || !plan.value) return
   await mutate(async () => {
-    let current = plan.value!
-    for (const inboundItem of removableItems) {
-      if (inboundItem.coLoadGroup) {
-        current = await removeSmartLoadingGroup(current.id, inboundItem.coLoadGroup.groupId, current.version)
-        acceptPlan(current)
-        continue
-      }
-      for (const original of inboundItem.sourceItems) {
-        const item = current.items.find((value) => value.id === original.id)
-        if (!item) continue
-        current = await removeSmartLoadingItem(current.id, item.id, current.version, item.version)
-        acceptPlan(current)
-      }
-    }
+    acceptPlan(await removeAllUnpickedSmartLoadingItems(plan.value!.id, plan.value!.version))
     await loadCandidateData()
     ElMessage.success(`已移除 ${itemCount} 个未拣入仓码`)
   }, '全部移除失败', { pickingConflict: true })
@@ -685,7 +678,7 @@ onMounted(() => { void load(); void loadCustomers() })
                 <el-button
                   v-if="canAssign && assignable"
                   size="small"
-                  type="primary"
+                  type="text"
                   plain
                   :disabled="candidateBlocked(row as SmartLoadingCandidateRow)"
                   @click="openAssign(row)"
@@ -763,7 +756,7 @@ onMounted(() => { void load(); void loadCustomers() })
                 <div><div class="meter-title"><span>重量</span><strong>{{ formatNumber(totalWeight, 1) }} / {{ formatNumber(weightLimit, 1) }} kg</strong></div><el-progress :percentage="Math.min(displayedWeightPercent, 100)" :status="weightPercent > 100 ? 'exception' : undefined" /></div>
               </div>
               <DataTable :data="displayedPlanItems" :columns="itemColumns" :loading="selectionLoading || mutating" stripe preference-key="global-smart-loading-items" column-settings-mode="hide" empty-text="当前柜次暂无装柜明细">
-                <template #actions="{ row }"><div class="row-actions"><el-button v-if="canDelete && editable && row.canRemove" size="small" type="danger" plain @click="remove(row)"><Trash2 :size="15" />删除</el-button></div></template>
+                <template #actions="{ row }"><div class="row-actions"><el-button v-if="canDelete && editable && row.canRemove" size="small" type="danger" text @click="remove(row)"><Trash2 :size="15" />删除</el-button></div></template>
                 <template #customerName="{ row }"><LineClampText :content="row.customerName" /></template>
                 <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroup" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.coLoadGroup.groupNo} · ${groupMemberLabel(row.coLoadGroup)}`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`固定 ${row.coLoadGroup.fullPackageCount} 箱 · ${row.coLoadGroup.lockedPlanId ? '已锁定' : '未锁定'}`" /></div><LineClampText v-else content="普通单票" /></template>
                 <template #packageCount="{ row }"><LineClampText v-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" /><div v-else class="package-count-editor"><el-input-number v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :disabled="mutating || !canAssign || !editable || !row.canAdjust" controls-position="right" @change="adjust(row)" /><LineClampText v-if="row.detailCount > 1 && editable" content="多规格，需删除后重加" /><LineClampText v-if="row.pickedPackageCount > 0" :content="`已拣 ${row.pickedPackageCount} 箱`" /></div></template>
@@ -778,7 +771,9 @@ onMounted(() => { void load(); void loadCustomers() })
           <div v-if="selectedCandidate" class="assign-dialog">
             <p><strong>{{ selectedCandidate.groupNo || selectedCandidate.customerName || '客户待补充' }}</strong></p>
             <p>目标柜次：{{ displayCabinetNo(selectedContainer) }} · 集装箱号：{{ displayActualContainerNo(selectedContainer) }}</p>
-            <p>发货仓：{{ selectedContainer?.warehouseName || '—' }} · 渠道：{{ resolveSmartLoadingChannelGroup(selectedContainer?.channelCode, selectedContainer?.channelName)?.name || '—' }}</p>
+            <p>发货仓：{{ selectedContainer?.warehouseName || '—' }} · 柜次渠道：{{ selectedContainer?.channelName || '—' }}</p>
+            <p>订单渠道：{{ selectedCandidate.channelName || '—' }}</p>
+            <el-alert v-if="crossChannelAssignment" title="订单渠道与柜次渠道不同；这是人工排柜，确认后仍会加入。智能推荐不会跨渠道。" type="warning" :closable="false" />
             <template v-if="selectedCandidate.coLoadGroupId">
               <p>组内 {{ selectedCandidate.memberOrderCount }} 票、{{ selectedCandidate.inboundFragmentCount }} 个入仓片段，共 {{ selectedCandidate.groupTotalBoxes }} 箱</p>
               <p v-for="summary in selectedCandidate.memberOrderSummaries" :key="summary">{{ summary }}</p>