优化

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

@@ -66,9 +66,9 @@ 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: { records: [{ accountId: 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' } })
+      .mockResolvedValueOnce({ code: '200', data: { records: [{ accountId: 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', estimatedVolumeCbm: '2.5', 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({ channelGroupCodes: ['EXX', 'HEDE'], warehouseId: '5', orderStatuses: ['PENDING_REVIEW', 'WAIT_MEASURE'], 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 })
+    expect(await listSmartLoadingCandidates({ channelGroupCodes: ['EXX', 'HEDE'], warehouseId: '5', orderStatuses: ['PENDING_REVIEW', 'WAIT_MEASURE'], 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, estimatedVolumeCbm: 2.5, coLoadGroupId: '9007199254740999', groupNo: 'CLG-9007199254740999', memberCount: 3, groupTotalBoxes: 21, locked: false, blockReason: null }], total: 1 })
     const candidateParams = vi.mocked(http.get).mock.calls.at(-1)?.[1]?.params as URLSearchParams
     expect(candidateParams.getAll('orderStatuses')).toEqual(['PENDING_REVIEW', 'WAIT_MEASURE'])
     expect(candidateParams.has('orderStatus')).toBe(false)
@@ -115,7 +115,7 @@ describe('platform container loading API', () => {
       page: '1', size: '200', total: '1', pages: '1',
     } })
 
-    const result = await listSmartLoadingWorkbenchContainers({ channelGroupCodes: ['MATSON_CLX', 'EXX'], customerId: '12', inboundCode: 'IN-1', createdStart: '2026-09-01', createdEnd: '2026-09-03', orderStatuses: ['WAIT_SPLIT'], page: 1, size: 200 })
+    const result = await listSmartLoadingWorkbenchContainers({ channelGroupCodes: ['MATSON_CLX', 'EXX'], customerId: '12', inboundCode: 'IN-1', createdStart: '2026-09-01', createdEnd: '2026-09-03', expectedArrivalStart: '2026-09-04', expectedArrivalEnd: '2026-09-06', orderStatuses: ['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
@@ -124,6 +124,8 @@ describe('platform container loading API', () => {
     expect(params.get('inboundCode')).toBe('IN-1')
     expect(params.get('createdStart')).toBe('2026-09-01')
     expect(params.get('createdEnd')).toBe('2026-09-03')
+    expect(params.get('expectedArrivalStart')).toBe('2026-09-04')
+    expect(params.get('expectedArrivalEnd')).toBe('2026-09-06')
     expect(params.has('orderStatus')).toBe(false)
     expect(params.has('orderStatuses')).toBe(false)
     expect(params.has('bookingId')).toBe(false)

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

@@ -247,6 +247,7 @@ function smartLoadingQueryParams(query: SmartLoadingCandidateQuery, includeOrder
   const optionalParams: Array<[string, string | number | undefined]> = [
     ['warehouseId', query.warehouseId], ['customerId', query.customerId], ['inboundCode', query.inboundCode],
     ['createdStart', query.createdStart], ['createdEnd', query.createdEnd],
+    ['expectedArrivalStart', query.expectedArrivalStart], ['expectedArrivalEnd', query.expectedArrivalEnd],
     ['page', query.page], ['size', query.size],
   ]
   for (const [key, value] of optionalParams) if (value !== undefined && value !== '') params.append(key, String(value))
@@ -275,6 +276,7 @@ export async function listSmartLoadingCandidates(query: SmartLoadingCandidateQue
         unitNetWeightKg: raw.unitNetWeightKg == null ? null : numberValue(raw.unitNetWeightKg),
         averageUnitVolumeCbm: raw.averageUnitVolumeCbm == null ? null : numberValue(raw.averageUnitVolumeCbm),
         availableVolumeCbm: raw.availableVolumeCbm == null ? null : numberValue(raw.availableVolumeCbm),
+        estimatedVolumeCbm: raw.estimatedVolumeCbm == null ? null : numberValue(raw.estimatedVolumeCbm),
         groupMembers: raw.groupMembers.map((member) => ({
           ...member, accountId: id(member.accountId), inboundId: id(member.inboundId), orderId: id(member.orderId),
           availablePackageCount: numberValue(member.availablePackageCount),

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

@@ -82,7 +82,7 @@ const candidate = {
   warehouseId: '8', channelCode: 'ZBYHK', channelName: '美森正班海卡包税', destinationWarehouseId: '9',
   destinationWarehouseCode: 'LAX9', destinationWarehouseName: 'LAX9', customerName: '另一企业', goodsSummary: '鞋类',
   availablePackageCount: 12, unitGrossWeightKg: 10, unitNetWeightKg: 9, averageUnitVolumeCbm: 0.2,
-  availableVolumeCbm: 2.4, coLoadGroupId: null, groupNo: null, memberCount: null, groupTotalBoxes: null,
+  availableVolumeCbm: 2.4, estimatedVolumeCbm: 3.5, coLoadGroupId: null, groupNo: null, memberCount: null, groupTotalBoxes: null,
   locked: null, blockReason: null,
 }
 function candidatePage(records: unknown[], page = 1, size = 20, total = records.length) {
@@ -149,6 +149,8 @@ describe('GlobalSmartLoadingView', () => {
     expect(wrapper.text()).not.toContain('SKU-1')
     expect(wrapper.text()).toContain('IN-1')
     expect(wrapper.text()).toContain('IN-2')
+    expect(wrapper.text()).toContain('预估体积')
+    expect(wrapper.text()).toContain('3.5 m³')
     expect(wrapper.text()).not.toContain('ORD-1')
     expect(wrapper.text()).not.toContain('ORD-2')
     expect(wrapper.get('.candidate-pane').text()).toContain('120 kg')
@@ -411,7 +413,7 @@ describe('GlobalSmartLoadingView', () => {
     expect(source).toContain(': candidate.availablePackageCount')
   })
 
-  it('filters candidates by creation range and multiple order statuses', async () => {
+  it('filters candidates by creation, expected-arrival range and multiple order statuses', async () => {
     vi.mocked(listSmartLoadingCandidates)
       .mockResolvedValueOnce(candidatePage([
       { ...candidate, inboundId: '51', inboundCode: 'IN-MATCH', orderStatusSnapshot: 'WAIT_SPLIT', expectedArrivalAt: '2026-09-11T08:00:00' },
@@ -425,6 +427,7 @@ describe('GlobalSmartLoadingView', () => {
 
     wrapper.getComponent(QueryToolbar).vm.$emit('search', {
       customerId: '', inboundCode: '', orderStatuses: ['WAIT_SPLIT', 'LOADING'], createdRange: ['2026-09-10', '2026-09-12'],
+      expectedArrivalRange: ['2026-09-11', '2026-09-15'],
     })
     await flushPromises()
 
@@ -432,7 +435,7 @@ describe('GlobalSmartLoadingView', () => {
     expect(candidates).toContain('IN-MATCH')
     expect(candidates).not.toContain('IN-WRONG-STATUS')
     expect(candidates).not.toContain('IN-WRONG-DATE')
-    expect(listSmartLoadingCandidates).toHaveBeenLastCalledWith({ channelGroupCodes: ['MATSON_CLX'], createdStart: '2026-09-10', createdEnd: '2026-09-12', orderStatuses: ['WAIT_SPLIT', 'LOADING'], page: 1, size: 20 })
+    expect(listSmartLoadingCandidates).toHaveBeenLastCalledWith({ channelGroupCodes: ['MATSON_CLX'], createdStart: '2026-09-10', createdEnd: '2026-09-12', expectedArrivalStart: '2026-09-11', expectedArrivalEnd: '2026-09-15', orderStatuses: ['WAIT_SPLIT', 'LOADING'], page: 1, size: 20 })
     expect(listSmartLoadingWorkbenchContainers).toHaveBeenCalledTimes(containerRequestCount)
     expect(listSmartLoadingWorkbenchContainers).toHaveBeenLastCalledWith({ channelGroupCodes: ['MATSON_CLX'], page: 1, size: 200 })
   })
@@ -608,7 +611,7 @@ describe('GlobalSmartLoadingView', () => {
     await flushPromises()
 
     const fields = wrapper.findComponent(QueryToolbar).props('fields') as Array<{ key: string; options?: Array<{ label: string; value: string }>; props?: Record<string, unknown> }>
-    expect(fields.map((field) => field.key)).toEqual(['warehouseId', 'customerId', 'inboundCode', 'createdRange', 'orderStatuses'])
+    expect(fields.map((field) => field.key)).toEqual(['warehouseId', 'customerId', 'inboundCode', 'createdRange', 'expectedArrivalRange', 'orderStatuses'])
     expect(fields.find((field) => field.key === 'warehouseId')?.options).toEqual([
       { label: '义乌仓', value: '8' },
       { label: '东莞仓', value: '18' },
@@ -915,6 +918,7 @@ describe('GlobalSmartLoadingView', () => {
     expect(source).toContain('.container-pane { max-height: min(58vh, 460px); }')
     expect(source).toContain('min-height: 112px')
     expect(source).toContain("label: '创建日期'")
+    expect(source).toContain("label: '预计到货时间'")
     expect(source).toContain("label: '订单状态'")
     expect(source).toContain('.smart-loading-query .query-toolbar__filters) { flex-wrap: nowrap; gap: 8px; overflow-x: auto; }')
     expect(source).toContain('.smart-loading-query .query-toolbar__actions) { flex-wrap: nowrap; gap: 6px; }')

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

@@ -64,7 +64,7 @@ const selectedCandidate = ref<SmartLoadingCandidateRow | null>(null)
 const assignForm = reactive({ packageCount: 1 })
 const quantityDrafts = reactive<Record<string, number>>({})
 const planGroupsByInboundId = ref(new Map<string, SmartLoadingPlanCoLoadGroup>())
-const query = ref<QueryModel>({ warehouseId: '', customerId: '', inboundCode: '', createdRange: [], orderStatuses: [] })
+const query = ref<QueryModel>({ warehouseId: '', customerId: '', inboundCode: '', createdRange: [], expectedArrivalRange: [], orderStatuses: [] })
 const appliedQuery = ref<QueryModel>({ ...query.value, orderStatuses: [] })
 const candidatePage = ref(1)
 const candidatePageSize = ref(20)
@@ -199,6 +199,7 @@ const queryFields = computed<QueryField[]>(() => [
   { key: 'customerId', type: 'select', label: '客户', placeholder: '全部客户', width: 180, options: customers.value.filter((customer) => customer.status === 'ACTIVE').map((customer) => ({ label: customer.tenantName, value: String(customer.id) })), props: { filterable: true, loading: customersLoading.value } },
   { key: 'inboundCode', type: 'input', label: '入仓码', placeholder: '请输入入仓码', width: 210 },
   { key: 'createdRange', type: 'daterange', label: '创建日期', placeholder: '请选择创建日期范围', width: 260 },
+  { key: 'expectedArrivalRange', type: 'daterange', label: '预计到货时间', placeholder: '请选择预计到货时间范围', width: 260 },
   { key: 'orderStatuses', type: 'select', label: '订单状态', placeholder: '全部订单状态', width: 210, options: candidateOrderStatusOptions, props: { multiple: true, collapseTags: true, collapseTagsTooltip: true, maxCollapseTags: 2 } },
 ])
 
@@ -229,6 +230,7 @@ const candidateColumns: DataTableColumn[] = [
   { key: 'totalGrossWeightKg', label: '重量', width: 90, slotName: 'candidateTotalWeight' },
   { key: 'averageUnitVolumeCbm', label: '单箱体积', width: 80, slotName: 'averageUnitVolume' },
   { key: 'totalVolumeCbm', label: '体积', width: 90, slotName: 'candidateTotalVolume' },
+  { key: 'estimatedVolumeCbm', label: '预估体积', width: 100, slotName: 'estimatedVolume' },
 ]
 const itemColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
@@ -300,6 +302,9 @@ function candidateQueryParams(): Parameters<typeof listSmartLoadingCandidates>[0
   const createdRange = Array.isArray(appliedQuery.value.createdRange)
     ? appliedQuery.value.createdRange.map((value) => String(value || '').slice(0, 10))
     : []
+  const expectedArrivalRange = Array.isArray(appliedQuery.value.expectedArrivalRange)
+    ? appliedQuery.value.expectedArrivalRange.map((value) => String(value || '').slice(0, 10))
+    : []
   const params: Parameters<typeof listSmartLoadingCandidates>[0] = {
     channelGroupCodes: [...selectedChannelCodes.value],
     page: candidatePage.value,
@@ -318,6 +323,10 @@ function candidateQueryParams(): Parameters<typeof listSmartLoadingCandidates>[0
     params.createdStart = createdRange[0]
     params.createdEnd = createdRange[1]
   }
+  if (expectedArrivalRange.length === 2) {
+    params.expectedArrivalStart = expectedArrivalRange[0]
+    params.expectedArrivalEnd = expectedArrivalRange[1]
+  }
   if (orderStatuses.length) params.orderStatuses = orderStatuses
   return params
 }
@@ -711,7 +720,8 @@ onMounted(() => { void load(); void loadCustomers() })
               <template #unitGrossWeight="{ row }">{{ formatMeasurement(row.unitGrossWeightKg, 'kg', 1) }}</template>
               <template #candidateTotalWeight="{ row }">{{ formatMeasurement(row.totalGrossWeightKg, 'kg', 1) }}</template>
               <template #averageUnitVolume="{ row }">{{ formatMeasurement(row.averageUnitVolumeCbm, 'm³') }}</template>
-              <template #candidateTotalVolume="{ row }">{{ formatMeasurement(row.totalVolumeCbm, 'm³') }}</template>
+                <template #candidateTotalVolume="{ row }">{{ formatMeasurement(row.totalVolumeCbm, 'm³') }}</template>
+                <template #estimatedVolume="{ row }">{{ row.estimatedVolumeCbm == null ? '—' : `${formatNumber(Number(row.estimatedVolumeCbm))} m³` }}</template>
               <template #cartonIdentityStatus><el-tag size="small" type="info" effect="plain">未核验</el-tag></template>
             </DataTable>
           </section>

src/modules/container-loading/types.ts

@@ -251,6 +251,7 @@ export interface SmartLoadingCandidate {
   unitNetWeightKg: number | null
   averageUnitVolumeCbm: number | null
   availableVolumeCbm: number | null
+  estimatedVolumeCbm: number | null
   coLoadGroupId: string | null
   groupNo: string | null
   memberCount: number | null
@@ -279,6 +280,8 @@ export interface SmartLoadingCandidateQuery {
   inboundCode?: string
   createdStart?: string
   createdEnd?: string
+  expectedArrivalStart?: string
+  expectedArrivalEnd?: string
   orderStatuses?: Array<'PENDING_REVIEW' | 'WAIT_MEASURE' | 'WAIT_SPLIT' | 'LOADING'>
   page: number
   size: number