fix(admin): stabilize released booking association

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

@@ -14,18 +14,18 @@ const detailResponse = (version = 0, status = 'DRAFT') => ({
 
 describe('ocean bookings api', () => {
   it('normalizes pagination and long ids', async () => {
-    vi.spyOn(http, 'get').mockResolvedValueOnce({ code: '200', message: 'ok', data: { records: [{ id: 123, customerId: 456, shipperName: '发货企业', consigneeName: '收货企业', containerCount: '3' }], page: '2', size: '20', total: '21', pages: '2' } })
+    vi.spyOn(http, 'get').mockResolvedValueOnce({ code: '200', message: 'ok', data: { records: [{ id: 123, bookingNo: 'OB-260825-0183', customerId: 456, shipperName: '发货企业', consigneeName: '收货企业', containerCount: '1' }], page: '2', size: '20', total: '21', pages: '2' } })
     const result = await listOceanBookings({ page: 1, size: 10 })
     expect(result.page).toBe(2)
     expect(result.total).toBe(21)
     expect(result.records[0]?.id).toBe('123')
     expect(result.records[0]?.customerId).toBe('456')
-    expect(result.records[0]).toMatchObject({ shipperName: '发货企业', consigneeName: '收货企业', containerCount: 3 })
+    expect(result.records[0]).toMatchObject({ bookingNo: 'OB-260825-0183', shipperName: '发货企业', consigneeName: '收货企业', containerCount: 1 })
   })
 
   it('uses the frozen single-query link candidate contract and normalizes long ids', async () => {
     vi.spyOn(http, 'get').mockResolvedValueOnce({ code: '200', data: { records: [{ oceanBookingId: 9007199254740993, bookingNo: 'OB-1', requirementId: 9007199254740994, containerType: '40HC', capacityCbm: '76', maxWeightKg: '28000', requiredQuantity: '2', allocatedQuantity: '1', remainingQuantity: '1', customerName: '客户', warehouseName: '义乌仓', channelName: '美森正班' }], page: '1', size: '200', total: '1', pages: '1' } })
-    const query = { warehouseId: '8', channelCode: 'ZBYHK', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000, page: 1, size: 200 }
+    const query = { warehouseId: '8', channelCode: 'ZBYHK', containerType: '40HC', page: 1, size: 200 }
 
     const result = await listOceanBookingLinkCandidates(query)
 

src/modules/ocean-bookings/pages/OceanBookingsView.test.ts

@@ -1,10 +1,24 @@
-import { describe, expect, it } from 'vitest'
+import ElementPlus from 'element-plus'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
+import OceanBookingsView from './OceanBookingsView.vue'
+import { listOceanBookings } from '../api/platformOceanBookings'
+
+const routerPush = vi.hoisted(() => vi.fn())
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: routerPush }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn().mockResolvedValue({ records: [] }) }))
+vi.mock('../api/platformOceanBookings', () => ({ listOceanBookings: vi.fn() }))
 
 const source = readFileSync(resolve(process.cwd(), 'src/modules/ocean-bookings/pages/OceanBookingsView.vue'), 'utf8')
 
 describe('OceanBookingsView', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.mocked(listOceanBookings).mockResolvedValue({ records: [], page: 1, size: 20, total: 0, pages: 0 })
+  })
   it('keeps the operation column first and left fixed', () => {
     expect(source.indexOf("key: 'actions'")).toBeLessThan(source.indexOf("prop: 'bookingNo'"))
     expect(source).toContain("fixed: 'left'")
@@ -41,6 +55,24 @@ describe('OceanBookingsView', () => {
     }
   })
 
+  it('displays the server containerCount as the booking requirement total without detail N+1', async () => {
+    vi.mocked(listOceanBookings).mockResolvedValueOnce({ records: [{
+      id: '183', bookingNo: 'OB-260825-0183', status: 'RELEASED', containerCount: 1,
+      customerName: '回归客户', vesselName: null, voyageNo: null, etd: null, eta: null, updatedAt: null,
+    }], page: 1, size: 20, total: 1, pages: 1 } as never)
+    const wrapper = mount(OceanBookingsView, { global: { plugins: [ElementPlus] } })
+
+    await (wrapper.vm as unknown as { load: () => Promise<void> }).load()
+    await flushPromises()
+
+    const tableText = wrapper.find('.el-table__body-wrapper').text()
+    expect(tableText).toContain('OB-260825-0183')
+    expect(tableText).toContain('1')
+    expect(source).toContain("label: '订舱柜量'")
+    expect(source).not.toContain('getOceanBooking')
+    wrapper.unmount()
+  })
+
   it('loads active customers by name and stays usable on narrow screens', () => {
     expect(source).toContain("listPlatformTenants({ page: 1, size: 200, status: 'ACTIVE' })")
     expect(source).toContain('label: customer.tenantName')

src/modules/ocean-bookings/pages/OceanBookingsView.vue

@@ -41,7 +41,7 @@ const columns = [
   { prop: 'billOfLadingNo', label: '提单号', minWidth: 155, formatter: (row: OceanBookingResource) => row.billOfLadingNo || '—' },
   { prop: 'shipperName', label: '提单发货人', minWidth: 160, formatter: (row: OceanBookingResource) => row.shipperName || '—' },
   { prop: 'consigneeName', label: '提单收货人', minWidth: 160, formatter: (row: OceanBookingResource) => row.consigneeName || '—' },
-  { prop: 'containerCount', label: '柜量', width: 90, align: 'right' },
+  { prop: 'containerCount', label: '订舱柜量', width: 100, align: 'right' },
   { prop: 'carrierName', label: '船公司', minWidth: 130 },
   { prop: 'bookingAgent', label: '订舱代理', minWidth: 140 },
   { prop: 'vesselName', label: '船名 / 航次', minWidth: 175, slotName: 'vessel' },

src/modules/ocean-bookings/types.ts

@@ -35,6 +35,7 @@ export interface OceanBookingDraftData {
 export interface OceanBookingResource {
   id: string; bookingNo: string | null; status: OceanBookingStatus; version: number
   customerId: string | null; customerName: string | null; billOfLadingNo: string | null
+  /** 订舱柜型需求 quantity 的总和，不是已关联真实柜数。 */
   shipperName: string | null; consigneeName: string | null; containerCount: number
   channelCode: string | null; channelName: string | null; warehouseId: string | null; warehouseName: string | null
   shippingCompanyId: string | null; shippingCompanyName: string | null; bookingAgentId: string | null; bookingAgentName: string | null
@@ -71,8 +72,6 @@ export interface OceanBookingLinkCandidateQuery {
   warehouseId: string
   channelCode: string
   containerType: string
-  capacityCbm: number
-  maxWeightKg: number
   page: number
   size: number
 }