优化

src/modules/ocean-bookings/api/platformOceanBookings.test.ts

@@ -5,9 +5,10 @@ import { http } from '@/shared/api/http'
 const detailResponse = (version = 0, status = 'CONFIRMED') => ({
   oceanBooking: {
     id: 123, bookingNo: 'OB123', status, version, customerId: 456, customerName: '客户',
-    containers: [],
   },
-  parties: [], containerRequirements: [], containerAllocations: [], histories: [],
+  parties: [],
+  containers: [{ containerBookingId: 9007199254740993, cabinetNo: 'CAB-1', containerNo: 'MSCU1234567', requirementId: 9007199254740994, allocationId: 9007199254740995, containerType: '40HC', containerKind: 'FCL', capacityCbm: 76, maxWeightKg: 28000, warehouseId: 9007199254740996, warehouseName: '义乌仓', channelCode: 'SEA', channelName: '海运', customerId: 456, customerName: '客户' }],
+  histories: [],
 })
 
 describe('ocean bookings api', () => {
@@ -22,15 +23,19 @@ describe('ocean bookings api', () => {
 
   it('uses version zero for create and extracts the id from the returned Detail', async () => {
     const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', message: 'ok', data: detailResponse(0, 'CONFIRMED') })
-    const created = await createOceanBooking({ expectedVersion: 0, data: { customerId: null, customerName: null, channelCode: 'SEA', warehouseId: '8', warehouseName: '义乌仓', billOfLadingNo: 'BL-1', vesselName: 'VESSEL', voyageNo: 'V001', estimatedSailingAt: '2026-08-12T10:00:00', estimatedArrivalAt: '2026-09-01T10:00:00', serviceTerm: null, freightTerm: null, parties: [], containerRequirements: [] } })
+    const created = await createOceanBooking({ expectedVersion: 0, data: { customerId: null, customerName: null, channelCode: 'SEA', warehouseId: '8', billOfLadingNo: 'BL-1', vesselName: 'VESSEL', voyageNo: 'V001', estimatedSailingAt: '2026-08-12T10:00:00', estimatedArrivalAt: '2026-09-01T10:00:00', serviceTerm: 'CY-CY', freightTerm: 'PREPAID', parties: [], containers: [{ containerNo: 'MSCU1234567', containerType: '40HC', containerKind: 'FCL', capacityCbm: 76, maxWeightKg: 28000 }] } })
     const sentPayload = post.mock.calls[0]?.[1] as { expectedVersion: number; data: Record<string, unknown> }
-    expect(sentPayload).toMatchObject({ expectedVersion: 0, data: { customerId: null, customerName: null, serviceTerm: null, freightTerm: null } })
+    expect(sentPayload).toMatchObject({ expectedVersion: 0, data: { customerId: null, customerName: null, serviceTerm: 'CY-CY', freightTerm: 'PREPAID' } })
     expect(sentPayload).not.toMatchObject({ data: { customerId: '', customerName: '' } })
     expect(sentPayload.data).toMatchObject({ billOfLadingNo: 'BL-1', vesselName: 'VESSEL', voyageNo: 'V001', estimatedSailingAt: '2026-08-12T10:00:00', estimatedArrivalAt: '2026-09-01T10:00:00' })
+    expect(sentPayload.data).toMatchObject({ containers: [{ containerNo: 'MSCU1234567', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000 }] })
+    expect(sentPayload.data).not.toHaveProperty('containerRequirements')
+    expect(sentPayload.data).not.toHaveProperty('warehouseName')
     expect(post.mock.calls[0]?.[2]).toMatchObject({ headers: { 'Idempotency-Key': expect.any(String) } })
     expect(created.id).toBe('123')
     expect(created.version).toBe(0)
     expect(created.status).toBe('CONFIRMED')
+    expect(created.containers[0]).toMatchObject({ containerBookingId: '9007199254740992', requirementId: '9007199254740994', allocationId: '9007199254740996', warehouseId: '9007199254740996', customerId: '456' })
   })
 
   it('uses action and change-specific request contracts', async () => {

src/modules/ocean-bookings/api/platformOceanBookings.ts

@@ -23,7 +23,6 @@ function booking(raw: OceanBookingResource): OceanBookingResource {
     bookingAgent: raw.bookingAgent ?? raw.bookingAgentName ?? null,
     etd: raw.etd ?? raw.estimatedSailingAt ?? null,
     eta: raw.eta ?? raw.estimatedArrivalAt ?? null,
-    containers: (raw.containers || []).map((container) => ({ ...container, id: String(container.id ?? '') })),
   }
 }
 function detail(raw: OceanBookingDetail): OceanBookingDetail {
@@ -34,8 +33,14 @@ function detail(raw: OceanBookingDetail): OceanBookingDetail {
     ...source,
     oceanBooking: source,
     parties: (raw.parties || []).map((party) => ({ ...party, id: party.id == null ? undefined : String(party.id) })),
-    containerRequirements: (raw.containerRequirements || []).map((container) => ({ ...container, id: container.id == null ? undefined : String(container.id) })),
-    containerAllocations: raw.containerAllocations || [],
+    containers: (raw.containers || []).map((container) => ({
+      ...container,
+      containerBookingId: String(container.containerBookingId),
+      requirementId: String(container.requirementId),
+      allocationId: String(container.allocationId),
+      warehouseId: String(container.warehouseId),
+      customerId: container.customerId == null ? null : String(container.customerId),
+    })),
     histories,
     statusHistory: histories,
   }