优化

src/modules/unified-orders/api/unifiedOrders.test.ts

@@ -9,6 +9,7 @@ import {
   listPlatformUnifiedOrders,
   listPlatformUnifiedOrderFeeDetails,
   updatePlatformUnifiedOrderDeclaration,
+  updatePlatformUnifiedOrderPlanning,
 } from './unifiedOrders'
 
 vi.mock('@/shared/api/http', () => ({
@@ -72,11 +73,11 @@ describe('unified orders API contract', () => {
 
   it('normalizes C02 row IDs and keeps inboundId for measurement routing', async () => {
     vi.mocked(http.get).mockResolvedValue({ data: {
-      records: [{ orderId: '90001', tenantId: '208', inboundId: '77', inboundVersion: 3, mainStatus: 'WAIT_MEASURE', channelCode: ' NY_EXX ', channelName: '纽约渠道', locationCodes: 'A0-01, B2-03', actualGrossWeightKg: '12.5', actualVolumeCbm: '0.45', totalPalletCount: '3', totalNetWeightKg: '11.2', chargeableVolumeCbm: '0.5', totalQuantity: '48', skuNos: ['SKU-1', ''], requestedPickupAt: '2026-08-18T09:30:00', customerRemark: '客户备注', latestInternalNote: '最新内部备注', relation: { role: 'PARENT', rootOrderId: 90001, parentOrderId: null, splitSequence: null, childCount: '2' }, measurement: null, preload: null, loading: null, delivery: null, transport: null }],
+      records: [{ orderId: '90001', orderVersion: '7', tenantId: '208', inboundId: '77', inboundVersion: 3, mainStatus: 'WAIT_MEASURE', channelCode: ' NY_EXX ', channelName: '纽约渠道', locationCodes: 'A0-01, B2-03', estimatedVolumeCbm: '0.4', expectedVolumeCbm: '0.45', actualGrossWeightKg: '12.5', actualVolumeCbm: '0.46', totalPalletCount: '3', totalNetWeightKg: '11.2', chargeableVolumeCbm: '0.5', totalQuantity: '48', skuNos: ['SKU-1', ''], requestedPickupAt: '2026-08-18T09:30:00', customerRemark: '客户备注', latestInternalNote: '最新内部备注', relation: { role: 'PARENT', rootOrderId: 90001, parentOrderId: null, splitSequence: null, childCount: '2' }, measurement: null, preload: null, loading: null, delivery: null, transport: null }],
       page: 1, size: 20, total: 1, pages: 1,
     } })
     await expect(listPlatformUnifiedOrders({ page: 1, size: 20 })).resolves.toMatchObject({
-      records: [{ orderId: '90001', tenantId: '208', inboundId: '77', inboundVersion: 3, channelCode: 'NY_EXX', locationCodes: 'A0-01, B2-03', actualGrossWeightKg: 12.5, actualVolumeCbm: 0.45, totalPalletCount: 3, totalNetWeightKg: 11.2, chargeableVolumeCbm: 0.5, totalQuantity: 48, skuNos: ['SKU-1'], requestedPickupAt: '2026-08-18T09:30:00', customerRemark: '客户备注', latestInternalNote: '最新内部备注', relation: { role: 'PARENT', rootOrderId: '90001', childCount: 2 } }],
+      records: [{ orderId: '90001', orderVersion: 7, tenantId: '208', inboundId: '77', inboundVersion: 3, channelCode: 'NY_EXX', locationCodes: 'A0-01, B2-03', estimatedVolumeCbm: 0.4, expectedVolumeCbm: 0.45, actualGrossWeightKg: 12.5, actualVolumeCbm: 0.46, totalPalletCount: 3, totalNetWeightKg: 11.2, chargeableVolumeCbm: 0.5, totalQuantity: 48, skuNos: ['SKU-1'], requestedPickupAt: '2026-08-18T09:30:00', customerRemark: '客户备注', latestInternalNote: '最新内部备注', relation: { role: 'PARENT', rootOrderId: '90001', childCount: 2 } }],
     })
   })
 
@@ -160,6 +161,23 @@ describe('unified orders API contract', () => {
     expect(http.put).toHaveBeenCalledWith('/platform/v1/orders/90001/declaration', request, { params: { tenantId: '208' } })
   })
 
+  it('updates arrival and operator-estimated volume through the dedicated versioned contract', async () => {
+    const request = {
+      expectedVersion: 7,
+      expectedArrivalAt: '2026-09-10T18:30:00',
+      estimatedVolumeCbm: 0.625,
+    }
+    vi.mocked(http.put).mockResolvedValue({ data: { previousVersion: 7, version: 8, changes: [] } })
+
+    await expect(updatePlatformUnifiedOrderPlanning('2089176869176389634', '2089223263733518337', request))
+      .resolves.toMatchObject({ version: 8 })
+    expect(http.put).toHaveBeenCalledWith(
+      '/platform/v1/orders/2089223263733518337/planning',
+      request,
+      { params: { tenantId: '2089176869176389634' } },
+    )
+  })
+
   it('loads fee detail rows from the inbound fee-detail contract', async () => {
     vi.mocked(http.get).mockResolvedValue({ data: [{ id: '1', inboundId: '88', reviewStatus: 'APPROVED', amount: 100 }] })
     await expect(listPlatformUnifiedOrderFeeDetails('208', '88')).resolves.toHaveLength(1)

src/modules/unified-orders/api/unifiedOrders.ts

@@ -83,6 +83,7 @@ export interface UnifiedOrderCoLoadGroupSummary {
 
 export interface UnifiedOrderResource {
   orderId: number | string
+  orderVersion?: number | null
   tenantId: number | string
   orderNo: string | null
   mainStatus: UnifiedOrderMainStatus
@@ -103,6 +104,7 @@ export interface UnifiedOrderResource {
   inboundCode: string | null
   expectedShipDate: string | null
   totalPackageCount: number | null
+  estimatedVolumeCbm?: number | null
   expectedVolumeCbm?: number | null
   locationCodes: string | null
   actualGrossWeightKg: number | null
@@ -362,6 +364,7 @@ export interface UpdateUnifiedOrderDeclarationRequest {
   expectedVersion: number
   customerRemark?: string | null
   expectedArrivalAt?: string | null
+  estimatedVolumeCbm?: number | null
   channelCode: string
   channelName: string
   cargoes: UnifiedOrderDeclarationCargo[]
@@ -384,6 +387,12 @@ export interface UpdateUnifiedOrderDeclarationResult {
   changes: UnifiedOrderDeclarationChange[]
 }
 
+export interface UpdateUnifiedOrderPlanningRequest {
+  expectedVersion: number
+  expectedArrivalAt?: string | null
+  estimatedVolumeCbm?: number | null
+}
+
 function optionalText(value: string | null | undefined) {
   const normalized = value?.trim()
   return normalized || null
@@ -397,6 +406,7 @@ function normalizeRow(raw: UnifiedOrderResource): UnifiedOrderResource {
   return {
     ...raw,
     orderId: String(raw.orderId),
+    orderVersion: nullableInteger(raw.orderVersion),
     tenantId: String(raw.tenantId),
     customerId: id(raw.customerId),
     channelCode: optionalText(raw.channelCode),
@@ -412,6 +422,7 @@ function normalizeRow(raw: UnifiedOrderResource): UnifiedOrderResource {
       childCount: integer(raw.relation.childCount, 0),
     } : null,
     totalPackageCount: nullableInteger(raw.totalPackageCount),
+    estimatedVolumeCbm: numberValue(raw.estimatedVolumeCbm),
     expectedVolumeCbm: numberValue(raw.expectedVolumeCbm),
     channelChanged: Boolean(raw.channelChanged),
     actualGrossWeightKg: numberValue(raw.actualGrossWeightKg),
@@ -492,6 +503,18 @@ export function updatePlatformUnifiedOrderDeclaration(
   ).then(unwrapApiResponse)
 }
 
+export function updatePlatformUnifiedOrderPlanning(
+  tenantId: string,
+  orderId: string,
+  request: UpdateUnifiedOrderPlanningRequest,
+) {
+  return http.put<ApiEnvelope<UpdateUnifiedOrderDeclarationResult>, ApiEnvelope<UpdateUnifiedOrderDeclarationResult>>(
+    `${unifiedOrdersApiPath}/${orderId}/planning`,
+    request,
+    { params: { tenantId } },
+  ).then(unwrapApiResponse)
+}
+
 export function downloadPlatformProductImage(tenantId: string, fileId: string) {
   return http.get<Blob, Blob>(
     `/platform/v1/files/product-images/${encodeURIComponent(tenantId)}/${encodeURIComponent(fileId)}`,