优化

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

@@ -87,7 +87,9 @@ describe('GlobalSmartLoadingView', () => {
     expect(getSmartLoadingPlanByBooking).toHaveBeenCalledWith(container.id)
     expect(listSmartLoadingCandidates).toHaveBeenCalledWith(container.id, container.warehouseId)
     expect(wrapper.text()).toContain('候选装柜明细')
-    expect(wrapper.text()).toContain('美森正班海卡包税')
+    expect(wrapper.text()).toContain('美森正班')
+    expect(wrapper.findAll('.channel-tabs [role="tab"]')).toHaveLength(9)
+    expect(wrapper.text()).not.toContain('美森正班海卡包税')
     expect(wrapper.text()).toContain('另一企业')
     expect(wrapper.text()).toContain('MSCU-1 装柜方案')
     expect(wrapper.text()).not.toContain('LP-99')
@@ -113,7 +115,8 @@ describe('GlobalSmartLoadingView', () => {
     const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
 
-    expect(wrapper.text()).toContain('纽约EXX海铁')
+    expect(wrapper.text()).toContain('EXX')
+    expect(wrapper.text()).not.toContain('纽约EXX海铁')
     expect(wrapper.text()).not.toContain('缺少渠道快照')
     expect(getSmartLoadingPlanByBooking).toHaveBeenCalledWith(container.id)
   })
@@ -157,7 +160,7 @@ describe('GlobalSmartLoadingView', () => {
     expect(option.text()).toContain('柜次号：待生成')
     expect(option.text()).toContain('集装箱号：待补录')
     expect(option.text()).not.toContain('开始装柜前录入集装箱号')
-    expect(option.text()).toContain('渠道：美森正班海卡包税')
+    expect(option.text()).toContain('渠道：美森正班')
     expect(option.text()).toContain('仓库：义乌国内仓')
     expect(option.text()).toContain('柜型：40HC')
     expect(option.text()).not.toContain('2088475410134773762')
@@ -184,7 +187,7 @@ describe('GlobalSmartLoadingView', () => {
     expect(wrapper.text()).not.toContain('MSCU-2')
     expect(wrapper.text()).not.toContain('个柜次')
 
-    const tab = wrapper.findAll('[role="tab"]').find((item) => item.text().includes('合德海卡包税'))
+    const tab = wrapper.findAll('[role="tab"]').find((item) => item.text() === '合德')
     expect(tab).toBeDefined()
     await tab!.trigger('click')
     await flushPromises()
@@ -195,6 +198,53 @@ describe('GlobalSmartLoadingView', () => {
     expect(listSmartLoadingCandidates).toHaveBeenLastCalledWith(other.id, other.warehouseId)
   })
 
+  it('merges detailed pricing channels into the same confirmed display group', async () => {
+    const parcelContainer = {
+      ...container,
+      id: '9007199254740998',
+      planId: '9007199254740999',
+      cabinetNo: 'CB-2',
+      containerNo: 'MSCU-2',
+      channelCode: 'MATSON_CLX_PARCEL',
+      channelName: '美森正班海派',
+    }
+    vi.mocked(listContainers).mockResolvedValue({ records: [container, parcelContainer], page: 1, size: 100, total: 2, pages: 1 })
+    const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+
+    expect(wrapper.findAll('.container-option')).toHaveLength(2)
+    expect(wrapper.text()).toContain('MSCU-1')
+    expect(wrapper.text()).toContain('MSCU-2')
+    expect(wrapper.text()).not.toContain('美森正班海卡包税')
+    expect(wrapper.text()).not.toContain('美森正班海派')
+  })
+
+  it('isolates Yiwu and Dongguan containers when the host changes the warehouse', async () => {
+    const dongguanContainer = {
+      ...container,
+      id: '9007199254740998',
+      planId: '9007199254740999',
+      cabinetNo: 'CB-DG',
+      containerNo: 'MSCU-DG',
+      warehouseId: '18',
+      warehouseName: '东莞仓',
+    }
+    vi.mocked(listContainers).mockResolvedValue({ records: [container, dongguanContainer], page: 1, size: 100, total: 2, pages: 1 })
+    vi.mocked(getSmartLoadingPlanByBooking).mockImplementation(async (bookingId) => ({ ...plan, bookingId }))
+    const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('MSCU-1')
+    expect(wrapper.text()).not.toContain('MSCU-DG')
+
+    await (wrapper.vm as unknown as { selectWarehouse: (code: string) => Promise<void> }).selectWarehouse('DONGGUAN')
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('MSCU-DG')
+    expect(wrapper.text()).not.toContain('MSCU-1')
+    expect(listSmartLoadingCandidates).toHaveBeenLastCalledWith(dongguanContainer.id, dongguanContainer.warehouseId)
+  })
+
   it('filters candidates by an active name-only customer selector and accountId', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/GlobalSmartLoadingView.vue'), 'utf8')
     expect(source).toContain("listPlatformTenants({ page: 1, size: 200, status: 'ACTIVE' })")