优化

src/modules/loading-lists/api/containerFees.test.ts

@@ -6,15 +6,16 @@ describe('container fee API', () => {
   beforeEach(() => vi.restoreAllMocks())
   it('passes accountId and exact controller DTOs', async () => {
     const get = vi.spyOn(http, 'get').mockResolvedValue({ code: '200', data: [] })
-    const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', data: { id: 3, sourceVersion: 1 } })
+    const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', data: { id: 3, loadingPlanId: 9, containerBookingId: 99, feeItemId: 7, feeItemNameSnapshot: '操作费', direction: 'PAYABLE', partnerId: 41, partnerName: '承运商A', businessDate: '2026-08-12', amount: 100, currency: 'CNY', settlementIncluded: true, reviewStatus: 'PENDING', sourceStatus: 'ACTIVE', sourceVersion: 1 } })
     const values = { feeItemId: '7', direction: 'PAYABLE' as const, partnerId: '41', partnerName: '承运商A', businessDate: '2026-08-12', amount: 100, currency: 'CNY' as const, settlementIncluded: true, remark: null }
-    await listContainerFees('9', '11'); await createContainerFee('9', '11', values)
+    await listContainerFees('9', '11'); const created = await createContainerFee('9', '11', values)
     await approveContainerFee('9', '11', '3'); await rejectContainerFee('9', '11', '3', '资料不全')
     await adjustContainerFee('9', '11', '3', 2, values); await voidContainerFee('9', '11', '3', 3)
     expect(get).toHaveBeenCalledWith('/platform/v1/loading-plans/9/fee-details', { params: { accountId: '11' } })
     expect(post).toHaveBeenCalledWith('/platform/v1/loading-plans/9/fee-details', values, { params: { accountId: '11' } })
     expect(post).toHaveBeenCalledWith('/platform/v1/loading-plans/9/fee-details/3/adjust', { expectedSourceVersion: 2, ...values }, { params: { accountId: '11' } })
     expect(post).toHaveBeenCalledWith('/platform/v1/loading-plans/9/fee-details/3/void', { expectedSourceVersion: 3 }, { params: { accountId: '11' } })
+    expect(created).toMatchObject({ id: '3', loadingPlanId: '9', containerBookingId: '99', direction: 'PAYABLE', partnerId: '41', partnerName: '承运商A' })
   })
 
   it('loads only ACTIVE counterparties for payable selection', async () => {
@@ -25,10 +26,18 @@ describe('container fee API', () => {
 
   it('reads allocation rows from Finance and never calculates them', async () => {
     const get = vi.spyOn(http, 'get')
-      .mockResolvedValueOnce({ code: '200', data: [{ id: 81, containerId: 99 }] })
-      .mockResolvedValueOnce({ code: '200', data: { cost: { id: 81, containerId: 99, supplierName: '承运商A', feeItemName: '拖车费', payableAmount: 300 }, allocations: [{ id: 1, orderId: 8, volumeCbm: 2, totalVolumeCbm: 5, allocationRate: 0.4, allocatedAmount: 120 }] } })
+      .mockResolvedValueOnce({ code: '200', data: [{ id: 81, customerId: 11, containerId: 99 }, { id: 82, customerId: 11, containerId: 100 }] })
+      .mockResolvedValueOnce({ code: '200', data: { cost: { id: 81, customerId: 11, containerId: 99, supplierName: '承运商A', feeItemName: '拖车费', payableAmount: 300 }, allocations: [{ id: 1, orderId: 8, volumeCbm: 2, totalVolumeCbm: 5, allocationRate: 0.4, allocatedAmount: 120 }] } })
     const result = await listContainerCostDetails('11', '99')
     expect(result[0]).toMatchObject({ supplierName: '承运商A', allocations: [{ orderId: '8', allocatedAmount: 120 }] })
     expect(get).toHaveBeenNthCalledWith(2, '/platform/finance/v1/cost-entries/81', { params: { customerId: '11' } })
+    expect(get).toHaveBeenCalledTimes(2)
+  })
+
+  it('fails closed when Finance detail does not echo the selected customer and container', async () => {
+    vi.spyOn(http, 'get')
+      .mockResolvedValueOnce({ code: '200', data: [{ id: 81, customerId: 11, containerId: 99 }] })
+      .mockResolvedValueOnce({ code: '200', data: { cost: { id: 81, customerId: 12, containerId: 99 }, allocations: [] } })
+    await expect(listContainerCostDetails('11', '99')).rejects.toThrow('Finance 成本详情与柜次或客户上下文不一致')
   })
 })

src/modules/loading-lists/api/containerFees.ts

@@ -130,11 +130,14 @@ export async function listContainerFeePartnerOptions(): Promise<ContainerFeePart
 
 export async function listContainerCostDetails(customerId: string, containerId: string): Promise<ContainerCostDetail[]> {
   const response = await http.get<ApiEnvelope<Record<string, unknown>[]>, ApiEnvelope<Record<string, unknown>[]>>('/platform/finance/v1/cost-entries', { params: { customerId } })
-  const costs = unwrapApiResponse(response).filter((raw) => id(raw.containerId) === containerId)
+  const costs = unwrapApiResponse(response).filter((raw) => id(raw.customerId) === customerId && id(raw.containerId) === containerId)
   return Promise.all(costs.map(async (raw) => {
     const costId = id(raw.id)
     const detailResponse = await http.get<ApiEnvelope<{ cost: Record<string, unknown>; allocations: Record<string, unknown>[] }>, ApiEnvelope<{ cost: Record<string, unknown>; allocations: Record<string, unknown>[] }>>(`/platform/finance/v1/cost-entries/${encodeURIComponent(costId)}`, { params: { customerId } })
     const detail = unwrapApiResponse(detailResponse)
+    if (id(detail.cost.id) !== costId || id(detail.cost.customerId) !== customerId || id(detail.cost.containerId) !== containerId) {
+      throw new Error('Finance 成本详情与柜次或客户上下文不一致')
+    }
     return { id: costId, containerId: detail.cost.containerId == null ? null : id(detail.cost.containerId), supplierName: detail.cost.supplierName == null ? null : String(detail.cost.supplierName), feeItemName: String(detail.cost.feeItemName || ''), amount: numberValue(detail.cost.payableAmount), allocations: (detail.allocations || []).map((item) => ({ id: id(item.id), orderId: id(item.orderId), inboundId: item.inboundId == null ? null : id(item.inboundId), volumeCbm: numberValue(item.volumeCbm), totalVolumeCbm: numberValue(item.totalVolumeCbm), allocationRate: numberValue(item.allocationRate), allocatedAmount: numberValue(item.allocatedAmount), roundingAdjustment: Boolean(item.roundingAdjustment) })) }
   }))
 }

src/modules/loading-lists/api/platformLoadingLists.test.ts

@@ -10,6 +10,7 @@ import {
 
 const preloadSummary = {
   planId: 1900000000000000001n as unknown as string,
+  containerBookingId: 1900000000000000004n as unknown as string,
   preloadNo: 'PL-001',
   containerNo: 'MSCU1234567',
   internalContainerNo: 'YG-001',
@@ -50,6 +51,7 @@ describe('platform loading lists API', () => {
     expect(get).toHaveBeenCalledWith('/platform/v1/first-leg/loading-plans', { params: { page: 1, size: 20, keyword: 'PL' } })
     expect(result.total).toBe(1)
     expect(result.records[0]?.planId).toBe('1900000000000000001')
+    expect(result.records[0]?.containerBookingId).toBe('1900000000000000004')
     expect(result.records[0]?.customers[0]?.accountId).toBe('1900000000000000002')
   })
 
@@ -58,6 +60,7 @@ describe('platform loading lists API', () => {
     const result = await getPreloadPlan('100', '300')
 
     expect(result.items[0]).toMatchObject({ itemId: '11', accountId: '12', inboundId: '13', inboundDetailId: '14', productQuantity: '20' })
+    expect(result.summary.containerBookingId).toBe('1900000000000000004')
     expect(result.histories[0]).toMatchObject({ historyId: '21', itemId: '11', operatorId: '22' })
   })
 
@@ -83,6 +86,7 @@ describe('platform loading lists API', () => {
     expect(get.mock.calls[0]?.[1]).toEqual({ params: { page: 1, size: 20 } })
     expect(get.mock.calls[1]?.[0]).toBe('/platform/v1/first-leg/loading-lists/100')
     expect(page.records[0]?.createdBy).toBe('9')
+    expect(page.records[0]?.containerBookingId).toBe('1900000000000000004')
     expect(loaded.summary.status).toBe('COMPLETED')
   })
 })

src/modules/loading-lists/api/platformLoadingLists.ts

@@ -9,6 +9,7 @@ export interface LoadingCustomer {
 
 export interface PreloadSummary {
   planId: string
+  containerBookingId: string
   preloadNo: string
   containerNo: string | null
   internalContainerNo: string | null
@@ -29,6 +30,7 @@ export interface PreloadSummary {
 
 export interface ConfirmedSummary {
   planId: string
+  containerBookingId: string
   loadingListNo: string
   warehouseId: string | null
   warehouseName: string | null
@@ -145,6 +147,7 @@ function normalizePreloadSummary(raw: PreloadSummary): PreloadSummary {
   return {
     ...raw,
     planId: requiredId(raw.planId),
+    containerBookingId: requiredId(raw.containerBookingId),
     warehouseId: optionalId(raw.warehouseId),
     skuCount: String(raw.skuCount ?? '0'),
     totalPackageCount: String(raw.totalPackageCount ?? '0'),
@@ -159,6 +162,7 @@ function normalizeConfirmedSummary(raw: ConfirmedSummary): ConfirmedSummary {
   return {
     ...raw,
     planId: requiredId(raw.planId),
+    containerBookingId: requiredId(raw.containerBookingId),
     warehouseId: optionalId(raw.warehouseId),
     createdBy: optionalId(raw.createdBy),
     totalPackageCount: String(raw.totalPackageCount ?? '0'),

src/modules/loading-lists/components/ContainerFeesPanel.test.ts

@@ -19,11 +19,11 @@ const detail = readFileSync(resolve(process.cwd(), 'src/modules/loading-lists/co
 
 class ResizeObserverStub { observe() {}; unobserve() {}; disconnect() {} }
 function memoryStorage(): Storage { const values = new Map<string, string>(); return { get length() { return values.size }, clear: () => values.clear(), getItem: (key) => values.get(key) ?? null, key: (index) => [...values.keys()][index] ?? null, removeItem: (key) => values.delete(key), setItem: (key, value) => values.set(key, value) } }
-async function mountPanel(permissions: string[], customers = [{ accountId: '11', customerName: '客户A' }]) {
+async function mountPanel(permissions: string[], customers = [{ accountId: '11', customerName: '客户A' }], containerBookingId = '99') {
   const pinia = createPinia(); setActivePinia(pinia)
   const auth = useAuthStore(); auth.token = 'token'; auth.permissions = permissions
   useAccessPreviewStore().initializeAfterLogin()
-  const wrapper = mount(ContainerFeesPanel, { attachTo: document.body, props: { planId: '9', customers }, global: { plugins: [pinia, ElementPlus] } })
+  const wrapper = mount(ContainerFeesPanel, { attachTo: document.body, props: { planId: '9', containerBookingId, customers }, global: { plugins: [pinia, ElementPlus] } })
   await flushPromises(); return wrapper
 }
 
@@ -37,7 +37,7 @@ beforeEach(() => {
 
 describe('ContainerFeesPanel contract', () => {
   it('is exposed from loading-list detail and derives customer context from real items', () => {
-    expect(detail).toContain('<ContainerFeesPanel :plan-id="summary.planId" :customers="feeCustomers" />')
+    expect(detail).toContain(':container-booking-id="summary.containerBookingId"')
     expect(detail).toContain('item.accountId')
     expect(panel).toContain('该柜次包含多个客户，请先选择费用归属客户')
     expect(panel).toContain('装柜明细缺少客户归属，无法安全维护费用')
@@ -79,6 +79,29 @@ describe('ContainerFeesPanel contract', () => {
     expect(listContainerCostDetails).not.toHaveBeenCalledWith('11', expect.anything())
   })
 
+  it('uses the summary container ID when fee rows are empty', async () => {
+    vi.mocked(listContainerFees).mockResolvedValue([])
+    await mountPanel(['firstleg:inbound:fee-detail:view'])
+    expect(listContainerCostDetails).toHaveBeenCalledWith('11', '99')
+  })
+
+  it('uses the summary container ID when fee rows agree', async () => {
+    vi.mocked(listContainerFees).mockResolvedValue([
+      { id: '1', loadingPlanId: '9', containerBookingId: '99', containerNo: null, feeItemId: '1', feeItemName: '费用A', direction: 'RECEIVABLE', partnerId: null, partnerName: null, businessDate: '2026-08-12', amount: 10, currency: 'CNY', settlementIncluded: true, reviewStatus: 'PENDING', sourceStatus: 'ACTIVE', sourceVersion: 1, remark: null, reviewerName: null, reviewedAt: null, reviewReason: null },
+    ])
+    await mountPanel(['firstleg:inbound:fee-detail:view'])
+    expect(listContainerCostDetails).toHaveBeenCalledWith('11', '99')
+  })
+
+  it('fails closed when fee rows disagree with the summary container', async () => {
+    vi.mocked(listContainerFees).mockResolvedValue([
+      { id: '2', loadingPlanId: '9', containerBookingId: '100', containerNo: null, feeItemId: '2', feeItemName: '费用B', direction: 'PAYABLE', partnerId: '41', partnerName: '承运商A', businessDate: '2026-08-12', amount: 20, currency: 'CNY', settlementIncluded: true, reviewStatus: 'PENDING', sourceStatus: 'ACTIVE', sourceVersion: 1, remark: null, reviewerName: null, reviewedAt: null, reviewReason: null },
+    ])
+    const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:fee-item:view'])
+    expect(wrapper.text()).toContain('柜次费用加载失败')
+    expect(listContainerCostDetails).not.toHaveBeenCalled()
+  })
+
   it('blocks write entry points without a selected customer or edit permission', async () => {
     const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view'], [{ accountId: '11', customerName: '客户A' }, { accountId: '22', customerName: '客户B' }])
     const state = (wrapper.vm.$ as unknown as { setupState: { openCreate(): void; save(): Promise<void>; editorOpen: boolean } }).setupState

src/modules/loading-lists/components/ContainerFeesPanel.vue

@@ -11,7 +11,7 @@ import StatusBadge from '@/shared/components/StatusBadge.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { adjustContainerFee, approveContainerFee, createContainerFee, listApplicableFeeItems, listContainerCostDetails, listContainerFeePartnerOptions, listContainerFees, rejectContainerFee, voidContainerFee, type ApplicableFeeItem, type ContainerCostDetail, type ContainerFeePartnerOption, type ContainerFeeResource, type ContainerFeeSaveRequest } from '../api/containerFees'
 
-const props = defineProps<{ planId: string; customers: Array<{ accountId: string; customerName: string | null }> }>()
+const props = defineProps<{ planId: string; containerBookingId: string; customers: Array<{ accountId: string; customerName: string | null }> }>()
 const access = useAccessPreviewStore()
 const accountId = ref('')
 const fees = ref<ContainerFeeResource[]>([])
@@ -46,7 +46,6 @@ const customerOptions = computed(() => {
 const selectedCustomer = computed(() => customerOptions.value.find((item) => item.value === accountId.value))
 const applicableItems = computed(() => feeItems.value.filter((item) => form.direction === 'RECEIVABLE'
   ? item.warehouseReceivable || item.pickupReceivable : item.warehousePayable || item.pickupPayable))
-const containerId = computed(() => fees.value.find((item) => item.containerBookingId)?.containerBookingId || null)
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', fixed: 'left', width: 300, slotName: 'actions', hideable: false, movable: false },
   { key: 'feeItemName', prop: 'feeItemName', label: '费用项目', minWidth: 150 },
@@ -102,7 +101,9 @@ async function load() {
     if (sequence !== loadSequence || requestedAccountId !== accountId.value) return
     fees.value = feeRows
     costs.value = []
-    const currentContainerId = feeRows.find((item) => item.containerBookingId)?.containerBookingId
+    const containerIds = [...new Set(feeRows.map((item) => item.containerBookingId).filter((value): value is string => Boolean(value)))]
+    if (containerIds.some((value) => value !== props.containerBookingId)) throw new Error('柜次费用与装柜摘要的柜次标识不一致，已停止查询财务分摊')
+    const currentContainerId = props.containerBookingId
     if (currentContainerId) {
       const result = await listContainerCostDetails(requestedAccountId, currentContainerId)
       if (sequence !== loadSequence || requestedAccountId !== accountId.value) return

src/modules/loading-lists/components/LoadingListDetailDrawer.vue

@@ -119,7 +119,7 @@ function formatNumber(value?: number | null, digits = 3) {
         </DataTable>
       </section>
 
-      <ContainerFeesPanel :plan-id="summary.planId" :customers="feeCustomers" />
+      <ContainerFeesPanel :plan-id="summary.planId" :container-booking-id="summary.containerBookingId" :customers="feeCustomers" />
 
       <section class="history-section surface-panel" aria-label="操作历史">
         <header><h2>操作历史</h2><span>{{ detail.histories.length }} 条</span></header>