优化

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

@@ -2,6 +2,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
 import {
   getConfirmedLoadingList,
+  uploadLoadingDeclaration,
+  completeLoadingDeclaration,
   getPreloadPlan,
   listConfirmedLoadingLists,
   listPreloadPlans,
@@ -89,4 +91,18 @@ describe('platform loading lists API', () => {
     expect(page.records[0]?.containerBookingId).toBe('1900000000000000004')
     expect(loaded.summary.status).toBe('COMPLETED')
   })
+
+  it('uses stable plan and warehouse ids for customs document actions', async () => {
+    const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', message: 'ok', data: { id: 6, documentType: 'CUSTOMS_DECLARATION', fileId: 9, fileName: 'declaration.pdf', version: 2 } })
+    const file = new File(['declaration'], 'declaration.pdf', { type: 'application/pdf' })
+    await uploadLoadingDeclaration('100', '300', file, 1, '上传资料')
+    await completeLoadingDeclaration('100', '300', 2, '完成报关')
+    expect(post.mock.calls[0]?.[0]).toBe('/platform/v1/first-leg/loading-lists/100/customs/document/upload')
+    const body = post.mock.calls[0]?.[1] as FormData
+    expect(body.get('file')).toBe(file)
+    expect(body.get('expectedVersion')).toBe('1')
+    expect(body.get('operationReason')).toBe('上传资料')
+    expect(post.mock.calls[0]?.[2]).toMatchObject({ params: { warehouseId: '300' }, headers: { 'Content-Type': 'multipart/form-data', 'Idempotency-Key': expect.any(String) } })
+    expect(post.mock.calls[1]?.[0]).toBe('/platform/v1/first-leg/loading-lists/100/customs/complete')
+  })
 })

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

@@ -95,10 +95,26 @@ export interface LoadingHistory {
   occurredAt: string
 }
 
+export interface BusinessDocument {
+  id: string | null
+  documentType: string
+  fileId: string
+  fileName: string
+  fileHash: string | null
+  uploadedBy: string | null
+  uploadedByName: string | null
+  uploadedAt: string | null
+  completedBy: string | null
+  completedByName: string | null
+  completedAt: string | null
+  version: number
+}
+
 export interface LoadingDetail<T extends LoadingListSummary = LoadingListSummary> {
   summary: T
   items: LoadingItem[]
   histories: LoadingHistory[]
+  customsDocument?: BusinessDocument | null
 }
 
 export interface LoadingListPage<T extends LoadingListSummary = LoadingListSummary> {
@@ -189,6 +205,10 @@ function normalizeHistory(raw: LoadingHistory): LoadingHistory {
     operatorId: requiredId(raw.operatorId),
   }
 }
+function normalizeDocument(raw: BusinessDocument | null | undefined): BusinessDocument | null {
+  if (!raw) return null
+  return { ...raw, id: raw.id == null ? null : requiredId(raw.id), fileId: requiredId(raw.fileId), uploadedBy: optionalId(raw.uploadedBy), completedBy: optionalId(raw.completedBy), version: Number(raw.version ?? 0) }
+}
 
 function normalizePage<T extends LoadingListSummary>(raw: RawPage<T>, normalize: (row: T) => T): LoadingListPage<T> {
   return {
@@ -222,6 +242,7 @@ export async function getPreloadPlan(planId: string, warehouseId: string) {
     summary: normalizePreloadSummary(result.summary),
     items: (result.items || []).map(normalizeItem),
     histories: (result.histories || []).map(normalizeHistory),
+    customsDocument: normalizeDocument(result.customsDocument),
   }
 }
 
@@ -236,9 +257,29 @@ export async function updatePreloadTransport(planId: string, warehouseId: string
     summary: normalizePreloadSummary(result.summary),
     items: (result.items || []).map(normalizeItem),
     histories: (result.histories || []).map(normalizeHistory),
+    customsDocument: normalizeDocument(result.customsDocument),
   }
 }
 
+export async function getLoadingDeclaration(planId: string, warehouseId: string) {
+  const response = await http.get<ApiEnvelope<BusinessDocument | null>, ApiEnvelope<BusinessDocument | null>>(`${basePath}/loading-lists/${encodeURIComponent(planId)}/customs`, { params: { warehouseId } })
+  return normalizeDocument(unwrapApiResponse(response))
+}
+
+export async function uploadLoadingDeclaration(planId: string, warehouseId: string, file: File, expectedVersion: number, operationReason?: string | null) {
+  const body = new FormData()
+  body.append('file', file)
+  body.append('expectedVersion', String(expectedVersion))
+  if (operationReason) body.append('operationReason', operationReason)
+  const response = await http.post<ApiEnvelope<BusinessDocument>, ApiEnvelope<BusinessDocument>>(`${basePath}/loading-lists/${encodeURIComponent(planId)}/customs/document/upload`, body, { params: { warehouseId }, headers: { 'Content-Type': 'multipart/form-data', 'Idempotency-Key': `loading-customs-upload-${planId}-${Date.now()}` } })
+  return normalizeDocument(unwrapApiResponse(response))
+}
+
+export async function completeLoadingDeclaration(planId: string, warehouseId: string, expectedVersion: number, operationReason?: string | null) {
+  const response = await http.post<ApiEnvelope<BusinessDocument>, ApiEnvelope<BusinessDocument>>(`${basePath}/loading-lists/${encodeURIComponent(planId)}/customs/complete`, { expectedVersion, operationReason }, { params: { warehouseId }, headers: { 'Idempotency-Key': `loading-customs-complete-${planId}-${Date.now()}` } })
+  return normalizeDocument(unwrapApiResponse(response))
+}
+
 export async function listConfirmedLoadingLists(query: LoadingListQuery) {
   const response = await http.get<ApiEnvelope<RawPage<ConfirmedSummary>>, ApiEnvelope<RawPage<ConfirmedSummary>>>(
     `${basePath}/loading-lists`,