优化

src/modules/container-loading/api/platformContainerLoading.test.ts

@@ -4,7 +4,7 @@ import { resolve } from 'node:path'
 import { http } from '@/shared/api/http'
 import {
   adjustSmartLoadingItem, assignSmartLoadingGroup, assignSmartLoadingItem, getContainer,
-  listContainers, listSmartLoadingCandidates, removeSmartLoadingGroup, removeSmartLoadingItem,
+  listContainers, listSmartLoadingCandidates, listSmartLoadingWorkbenchContainers, removeSmartLoadingGroup, removeSmartLoadingItem,
   getContainerClearance, downloadContainerClearance, uploadContainerClearance, completeContainerClearance,
   getContainerOverview, markContainerException, cancelContainerException, uploadContainerDocument, downloadContainerDocument, downloadContainerPdaPhoto,
   getCustomerContainerTransitSummary,
@@ -66,10 +66,13 @@ describe('platform container loading API', () => {
   it('normalizes every long id in candidates and plans', async () => {
     vi.mocked(http.get)
       .mockResolvedValueOnce({ code: '200', data: container })
-      .mockResolvedValueOnce({ code: '200', data: [{ accountId: 1, inboundId: 2, orderId: 4, inboundCode: 'IN-1', orderStatusSnapshot: 'WAIT_SPLIT', expectedArrivalAt: '2026-09-10T09:30:00', warehouseId: 5, destinationWarehouseId: 6, channelCode: 'NY_EXX', channelName: '纽约EXX海铁', goodsSummary: '服装、鞋类', availablePackageCount: '7', unitGrossWeightKg: '12.5', unitNetWeightKg: '11.8', averageUnitVolumeCbm: '0.187', availableVolumeCbm: '1.309', coLoadGroupId: 9007199254740999n, groupNo: 'CLG-9007199254740999', memberCount: '3', groupTotalBoxes: '21', locked: false, blockReason: null }] })
+      .mockResolvedValueOnce({ code: '200', data: { records: [{ accountId: 1, customerId: 1, inboundId: 2, orderId: 4, orderNo: 'ORD-1', inboundCode: 'IN-1', orderStatusSnapshot: 'WAIT_SPLIT', expectedArrivalAt: '2026-09-10T09:30:00', warehouseId: 5, destinationWarehouseId: 6, channelCode: 'NY_EXX', channelName: '纽约EXX海铁', customerName: '示例企业', goodsSummary: '服装、鞋类', availablePackageCount: '7', unitGrossWeightKg: '12.5', unitNetWeightKg: '11.8', averageUnitVolumeCbm: '0.187', availableVolumeCbm: '1.309', coLoadGroupId: 9007199254740999n, groupNo: 'CLG-9007199254740999', memberCount: '3', groupTotalBoxes: '21', locked: false, blockReason: null, groupMembers: [] }], page: '1', size: '20', total: '1', pages: '1' } })
     expect((await getContainer('9')).id).toBe(String(container.id))
-    expect(await listSmartLoadingCandidates('7', '5')).toMatchObject([{ accountId: '1', inboundId: '2', inboundCode: 'IN-1', orderStatusSnapshot: 'WAIT_SPLIT', expectedArrivalAt: '2026-09-10T09:30:00', destinationWarehouseId: '6', channelCode: 'NY_EXX', channelName: '纽约EXX海铁', goodsSummary: '服装、鞋类', availablePackageCount: 7, unitGrossWeightKg: 12.5, unitNetWeightKg: 11.8, averageUnitVolumeCbm: 0.187, availableVolumeCbm: 1.309, coLoadGroupId: '9007199254740999', groupNo: 'CLG-9007199254740999', memberCount: 3, groupTotalBoxes: 21, locked: false, blockReason: null }])
-    expect(http.get).toHaveBeenLastCalledWith('/platform/v1/first-leg/smart-loading/inbound-candidates', { params: { bookingId: '7', warehouseId: '5' } })
+    expect(await listSmartLoadingCandidates({ channelGroupCodes: ['EXX', 'HEDE'], warehouseId: '5', page: 1, size: 20 })).toMatchObject({ records: [{ accountId: '1', customerId: '1', inboundId: '2', inboundCode: 'IN-1', orderStatusSnapshot: 'WAIT_SPLIT', expectedArrivalAt: '2026-09-10T09:30:00', destinationWarehouseId: '6', channelCode: 'NY_EXX', channelName: '纽约EXX海铁', goodsSummary: '服装、鞋类', availablePackageCount: 7, unitGrossWeightKg: 12.5, unitNetWeightKg: 11.8, averageUnitVolumeCbm: 0.187, availableVolumeCbm: 1.309, coLoadGroupId: '9007199254740999', groupNo: 'CLG-9007199254740999', memberCount: 3, groupTotalBoxes: 21, locked: false, blockReason: null }], total: 1 })
+    const params = vi.mocked(http.get).mock.calls.at(-1)?.[1]?.params as URLSearchParams
+    expect(params.getAll('channelGroupCodes')).toEqual(['EXX', 'HEDE'])
+    expect(params.get('warehouseId')).toBe('5')
+    expect(params.has('bookingId')).toBe(false)
   })
 
   it('sends plan and item versions plus operation identifiers', async () => {
@@ -85,6 +88,25 @@ describe('platform container loading API', () => {
     expect(vi.mocked(http.delete).mock.calls[0]?.[1]).toMatchObject({ data: { expectedPlanVersion: 9, expectedItemVersion: 10, operationId: expect.stringContaining('remove-') } })
   })
 
+  it('queries workbench containers with the same global filters and excludes the retired booking parameter', async () => {
+    vi.mocked(http.get).mockResolvedValueOnce({ code: '200', data: {
+      records: [{ bookingId: 9007199254740993n, bookingNo: 'BK-1', cabinetNo: 'CAB-1', containerNo: null, warehouseId: 8, warehouseName: '义乌仓', channelCode: 'MATSON_CLX_TRUCK', channelName: '美森正班海卡', containerType: '40HC', planId: 9007199254740994n, planNo: 'LP-1', planStatus: 'EDITING', version: '2' }],
+      page: '1', size: '200', total: '1', pages: '1',
+    } })
+
+    const result = await listSmartLoadingWorkbenchContainers({ channelGroupCodes: ['MATSON_CLX', 'EXX'], customerId: '12', inboundCode: 'IN-1', expectedArrivalStart: '2026-09-01', expectedArrivalEnd: '2026-09-03', orderStatus: 'WAIT_SPLIT', page: 1, size: 200 })
+
+    expect(result).toMatchObject({ records: [{ bookingId: '9007199254740993', warehouseId: '8', planId: '9007199254740994', version: 2 }], total: 1 })
+    const params = vi.mocked(http.get).mock.calls.at(-1)?.[1]?.params as URLSearchParams
+    expect(params.getAll('channelGroupCodes')).toEqual(['MATSON_CLX', 'EXX'])
+    expect(params.get('customerId')).toBe('12')
+    expect(params.get('inboundCode')).toBe('IN-1')
+    expect(params.get('expectedArrivalStart')).toBe('2026-09-01')
+    expect(params.get('expectedArrivalEnd')).toBe('2026-09-03')
+    expect(params.get('orderStatus')).toBe('WAIT_SPLIT')
+    expect(params.has('bookingId')).toBe(false)
+  })
+
   it('uses only the atomic group assign and whole-group remove endpoints for co-load groups', async () => {
     vi.mocked(http.post).mockResolvedValue({ code: '200', data: plan })
     vi.mocked(http.delete).mockResolvedValue({ code: '200', data: plan })

src/modules/container-loading/api/platformContainerLoading.ts

@@ -16,6 +16,9 @@ import type {
   ContainerSimulationCreateRequest,
   ContainerOceanBookingLinkRequest,
   SmartLoadingCandidate,
+  SmartLoadingCandidatePage,
+  SmartLoadingCandidateQuery,
+  SmartLoadingWorkbenchContainerPage,
   SmartLoadingItem,
   SmartLoadingPlan,
   BusinessDocument,
@@ -225,21 +228,58 @@ export async function completeContainerClearance(containerId: string, expectedVe
   return document(unwrapApiResponse(response))
 }
 
-export async function listSmartLoadingCandidates(bookingId: string, warehouseId: string) {
-  const response = await http.get<ApiEnvelope<SmartLoadingCandidate[]>, ApiEnvelope<SmartLoadingCandidate[]>>(`${smartLoadingPath}/inbound-candidates`, { params: { bookingId, warehouseId } })
-  return unwrapApiResponse(response).map((raw) => ({
-    ...raw, accountId: id(raw.accountId), inboundId: id(raw.inboundId),
-    orderId: id(raw.orderId), warehouseId: id(raw.warehouseId), destinationWarehouseId: optionalId(raw.destinationWarehouseId),
-    coLoadGroupId: optionalId(raw.coLoadGroupId),
-    memberCount: raw.memberCount == null ? null : numberValue(raw.memberCount),
-    groupTotalBoxes: raw.groupTotalBoxes == null ? null : numberValue(raw.groupTotalBoxes),
-    locked: raw.locked == null ? null : Boolean(raw.locked),
-    availablePackageCount: numberValue(raw.availablePackageCount),
-    unitGrossWeightKg: raw.unitGrossWeightKg == null ? null : numberValue(raw.unitGrossWeightKg),
-    unitNetWeightKg: raw.unitNetWeightKg == null ? null : numberValue(raw.unitNetWeightKg),
-    averageUnitVolumeCbm: raw.averageUnitVolumeCbm == null ? null : numberValue(raw.averageUnitVolumeCbm),
-    availableVolumeCbm: raw.availableVolumeCbm == null ? null : numberValue(raw.availableVolumeCbm),
-  }))
+function smartLoadingQueryParams(query: SmartLoadingCandidateQuery) {
+  const params = new URLSearchParams()
+  for (const channelGroupCode of query.channelGroupCodes) params.append('channelGroupCodes', channelGroupCode)
+  const optionalParams: Array<[string, string | number | undefined]> = [
+    ['warehouseId', query.warehouseId], ['customerId', query.customerId], ['inboundCode', query.inboundCode],
+    ['expectedArrivalStart', query.expectedArrivalStart], ['expectedArrivalEnd', query.expectedArrivalEnd],
+    ['orderStatus', query.orderStatus], ['page', query.page], ['size', query.size],
+  ]
+  for (const [key, value] of optionalParams) if (value !== undefined && value !== '') params.append(key, String(value))
+  return params
+}
+
+export async function listSmartLoadingCandidates(query: SmartLoadingCandidateQuery) {
+  const params = smartLoadingQueryParams(query)
+  const response = await http.get<ApiEnvelope<SmartLoadingCandidatePage>, ApiEnvelope<SmartLoadingCandidatePage>>(`${smartLoadingPath}/inbound-candidates`, { params })
+  const result = unwrapApiResponse(response)
+  return {
+    ...result,
+    page: numberValue(result.page, query.page), size: numberValue(result.size, query.size),
+    total: numberValue(result.total), pages: numberValue(result.pages),
+    records: result.records.map((raw) => ({
+      ...raw, accountId: id(raw.accountId), customerId: id(raw.customerId), inboundId: id(raw.inboundId),
+      orderId: id(raw.orderId), warehouseId: id(raw.warehouseId), destinationWarehouseId: optionalId(raw.destinationWarehouseId),
+      coLoadGroupId: optionalId(raw.coLoadGroupId),
+      memberCount: raw.memberCount == null ? null : numberValue(raw.memberCount),
+      groupTotalBoxes: raw.groupTotalBoxes == null ? null : numberValue(raw.groupTotalBoxes),
+      locked: raw.locked == null ? null : Boolean(raw.locked),
+      availablePackageCount: numberValue(raw.availablePackageCount),
+      unitGrossWeightKg: raw.unitGrossWeightKg == null ? null : numberValue(raw.unitGrossWeightKg),
+      unitNetWeightKg: raw.unitNetWeightKg == null ? null : numberValue(raw.unitNetWeightKg),
+      averageUnitVolumeCbm: raw.averageUnitVolumeCbm == null ? null : numberValue(raw.averageUnitVolumeCbm),
+      availableVolumeCbm: raw.availableVolumeCbm == null ? null : numberValue(raw.availableVolumeCbm),
+      groupMembers: raw.groupMembers.map((member) => ({
+        ...member, accountId: id(member.accountId), inboundId: id(member.inboundId), orderId: id(member.orderId),
+        availablePackageCount: numberValue(member.availablePackageCount),
+      })),
+    })),
+  }
+}
+
+export async function listSmartLoadingWorkbenchContainers(query: SmartLoadingCandidateQuery) {
+  const response = await http.get<ApiEnvelope<SmartLoadingWorkbenchContainerPage>, ApiEnvelope<SmartLoadingWorkbenchContainerPage>>(`${smartLoadingPath}/containers`, { params: smartLoadingQueryParams(query) })
+  const result = unwrapApiResponse(response)
+  return {
+    ...result,
+    page: numberValue(result.page, query.page), size: numberValue(result.size, query.size),
+    total: numberValue(result.total), pages: numberValue(result.pages),
+    records: result.records.map((raw) => ({
+      ...raw, bookingId: id(raw.bookingId), warehouseId: id(raw.warehouseId), planId: optionalId(raw.planId),
+      version: numberValue(raw.version),
+    })),
+  }
 }
 
 export async function getSmartLoadingPlanByBooking(bookingId: string) {