Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test

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

@@ -81,7 +81,6 @@ describe('GlobalSmartLoadingView', () => {
       { label: '待装柜', value: 'WAIT_LOADING' },
       { label: '预装柜中', value: 'EDITING' },
       { label: '拣货中', value: 'LOADING' },
-      { label: '装柜完成', value: 'COMPLETED' },
     ])
 
     expect(wrapper.text()).not.toContain('税率')
@@ -99,6 +98,28 @@ describe('GlobalSmartLoadingView', () => {
     expect(wrapper.text()).toContain('CB-1 装柜方案')
   })
 
+  it('does not overwrite the container status when selecting it', async () => {
+    const waiting = { ...container, id: '9007199254740995', planId: '9007199254740996', cabinetNo: 'CB-WAIT', planStatus: 'WAIT_LOADING' as const }
+    vi.mocked(listContainers).mockResolvedValue({ records: [container, waiting], page: 1, size: 100, total: 2, pages: 1 })
+    vi.mocked(getSmartLoadingPlanByBooking).mockImplementation(async (bookingId) => (
+      bookingId === waiting.id
+        ? { ...plan, bookingId: waiting.id, status: 'LOADING' as const }
+        : plan
+    ))
+    const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+
+    const waitingOption = wrapper.findAll('.container-option').find((item) => item.text().includes('CB-WAIT'))!
+    expect(waitingOption.text()).toContain('待装柜')
+
+    await waitingOption.trigger('click')
+    await flushPromises()
+
+    expect(getSmartLoadingPlanByBooking).toHaveBeenCalledWith(waiting.id)
+    expect(waitingOption.text()).toContain('待装柜')
+    expect(waitingOption.text()).not.toContain('拣货中')
+  })
+
   it('keeps picking containers editable while hiding the push action', async () => {
     const pushed = { ...container, id: '9007199254740995', planId: '9007199254740996', cabinetNo: 'CB-2', planStatus: 'LOADING' as const }
     const pickingPlan = { ...plan, bookingId: pushed.id, status: 'LOADING' as const }
@@ -116,19 +137,15 @@ describe('GlobalSmartLoadingView', () => {
     expect(wrapper.findAll('button').some((item) => item.text().trim() === '推送预装')).toBe(false)
   })
 
-  it('routes completed containers to the read-only loading list', async () => {
+  it('hides completed containers from the smart loading workbench', async () => {
     const completed = { ...container, id: '9007199254740997', planId: '9007199254740998', cabinetNo: 'CB-3', planStatus: 'COMPLETED' as const }
     vi.mocked(listContainers).mockResolvedValue({ records: [completed], page: 1, size: 100, total: 1, pages: 1 })
     const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
 
     expect(getSmartLoadingPlanByBooking).not.toHaveBeenCalled()
-    expect(wrapper.text()).toContain('该柜次已完成装柜')
-    await wrapper.findAll('button').find((item) => item.text().includes('查看装柜清单'))!.trigger('click')
-    expect(routerPush).toHaveBeenCalledWith({
-      name: 'loading-lists',
-      query: { planId: completed.planId, warehouseId: completed.warehouseId },
-    })
+    expect(wrapper.text()).not.toContain('CB-3')
+    expect(wrapper.text()).not.toContain('装柜完成')
   })
 
   it('refreshes the latest plan after A0409 without losing the selected container', async () => {

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

@@ -74,7 +74,6 @@ const queryFields = computed<QueryField[]>(() => [
     { label: '待装柜', value: 'WAIT_LOADING' },
     { label: '预装柜中', value: 'EDITING' },
     { label: '拣货中', value: 'LOADING' },
-    { label: '装柜完成', value: 'COMPLETED' },
   ] },
 ])
 
@@ -82,6 +81,7 @@ const filteredContainers = computed(() => {
   const keyword = String(appliedQuery.value.containerKeyword || '').trim().toLowerCase()
   const status = String(appliedQuery.value.status || '')
   return containers.value.filter((item) => {
+    if (item.planStatus === 'COMPLETED') return false
     if (status && item.planStatus !== status) return false
     if (!keyword) return true
     return [item.cabinetNo, item.containerNo, item.bookingNo, item.destinationWarehouseCode, item.destinationWarehouseName]
@@ -142,14 +142,14 @@ function syncDrafts(next: SmartLoadingPlan, preserved: Record<string, number> =
   for (const key of Object.keys(quantityDrafts)) delete quantityDrafts[key]
   for (const item of next.items || []) quantityDrafts[item.id] = preserved[item.id] ?? item.packageCount
 }
-function acceptPlan(next: SmartLoadingPlan, preserved: Record<string, number> = {}) {
+function acceptPlan(next: SmartLoadingPlan, preserved: Record<string, number> = {}, syncContainerStatus = true) {
   plan.value = next
   noDraft.value = false
   syncDrafts(next, preserved)
   const container = selectedContainer.value
   if (container) {
     container.planId = next.id
-    container.planStatus = next.status
+    if (syncContainerStatus) container.planStatus = next.status
   }
 }
 function clearSelectionData() {
@@ -178,7 +178,7 @@ async function loadSelectedData(preserved: Record<string, number> = {}) {
     ])
     if (request !== selectionRequest) return
     candidates.value = candidateResult
-    if (planResult.value) acceptPlan(planResult.value, preserved)
+    if (planResult.value) acceptPlan(planResult.value, preserved, false)
     else noDraft.value = planResult.missing
   } catch (error) {
     if (request === selectionRequest) selectionError.value = getApiErrorDetails(error, '柜次装柜数据加载失败')
@@ -382,7 +382,7 @@ onMounted(load)
           </section>
 
           <aside class="dispatch-pane container-pane" aria-label="货柜列表">
-            <header class="pane-header"><div><strong>货柜</strong><small>待装柜、预装柜中、拣货中与装柜完成</small></div></header>
+            <header class="pane-header"><div><strong>货柜</strong><small>待装柜、预装柜中与拣货中</small></div></header>
             <div v-loading="loading" class="container-list">
               <el-empty v-if="!filteredContainers.length" description="暂无符合条件的货柜" :image-size="72" />
               <button