Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev

2026-09-09 13:35:45 +08:00
parent 28d97d2221 7c34b214af
commit e428002898
81 changed files with 2817 additions and 478 deletions
@@ -29,8 +29,8 @@ describe('customer visit API', () => {

  it('updates delivery status so selecting delivered can generate a visit', async () => {
    vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', data: { deliveryStatus: 'DELIVERED' } })
-    await updateDeliveryOrderStatus('DEL/1', '100', { status: 'DELIVERED', remark: '完成' })
-    expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1/status', { status: 'DELIVERED', remark: '完成' }, { params: { customerId: '100' } })
+    await updateDeliveryOrderStatus('DEL/1', '100', { status: 'DELIVERED', expectedVersion: 7, remark: '完成' })
+    expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1/status', { status: 'DELIVERED', expectedVersion: 7, remark: '完成' }, { params: { customerId: '100' } })
  })

  it('uploads and saves repeatable visit material', async () => {
@@ -107,7 +107,7 @@ export async function completeDeliveryOrder(deliveryNo: string, customerId: stri
  return unwrapApiResponse(response)
 }

-export async function updateDeliveryOrderStatus(deliveryNo: string, customerId: string, payload: { status: string; remark?: string }) {
+export async function updateDeliveryOrderStatus(deliveryNo: string, customerId: string, payload: { status: string; expectedVersion: number; remark?: string }) {
  const response = await overseasHttp.put<ApiEnvelope<{ visitId?: string | null; deliveryNo: string; deliveryStatus: string; visitStatus?: string | null; replayed: boolean }>, ApiEnvelope<{ visitId?: string | null; deliveryNo: string; deliveryStatus: string; visitStatus?: string | null; replayed: boolean }>>(
    `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}/status`, payload,
    { params: { customerId } },
@@ -0,0 +1,28 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { overseasHttp } from '@/shared/api/overseasHttp'
+import { deliveryDocumentCategories, getDeliveryDocuments, saveDeliveryDocuments, uploadDeliveryDocument, downloadDeliveryDocument } from './deliveryDocuments'
+vi.mock('@/shared/api/overseasHttp', () => ({ overseasHttp: { get: vi.fn(), post: vi.fn(), put: vi.fn() } }))
+describe('delivery document API', () => {
+  beforeEach(() => vi.clearAllMocks())
+  it('scopes reads and full three-category snapshots by customer and delivery number', async () => {
+    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: {} })
+    vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', data: {} })
+    await getDeliveryDocuments('DL/1', '9007199254740993')
+    expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DL%2F1/documents', { params: { customerId: '9007199254740993' } })
+    const body = { expectedVersion: 8, idempotencyKey: 'save-1', bolNo: null, documents: deliveryDocumentCategories.map(item => ({ category: item.category, fileIds: [] })) }
+    await saveDeliveryDocuments('DL/1', '9007199254740993', body)
+    expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DL%2F1/documents', body, { params: { customerId: '9007199254740993' } })
+  })
+  it('uploads only the file and downloads through the authenticated category endpoint', async () => {
+    vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', data: { fileId: '9007199254740995' } })
+    const file = new File(['data'], 'proof.bin')
+    await uploadDeliveryDocument('DL/1', '100', 'RECEIPT', file)
+    const [url, body, config] = vi.mocked(overseasHttp.post).mock.calls[0]!
+    expect(url).toBe('/platform/v1/last-leg/delivery-orders/DL%2F1/documents/RECEIPT/files')
+    expect(Array.from((body as FormData).keys())).toEqual(['file'])
+    expect((body as FormData).get('file')).toBe(file)
+    expect(config).toEqual({ params: { customerId: '100' } })
+    await downloadDeliveryDocument('DL/1', '100', 'RECEIPT', '9007199254740995')
+    expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DL%2F1/documents/RECEIPT/files/9007199254740995/download', { params: { customerId: '100' }, responseType: 'blob' })
+  })
+})
@@ -0,0 +1,33 @@
+import { overseasHttp } from '@/shared/api/overseasHttp'
+import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
+export const deliveryDocumentCategories = [
+  { category: 'LOADING_PHOTO', label: '装车照片' },
+  { category: 'BOL', label: 'BOL文件（含签名）' },
+  { category: 'RECEIPT', label: '签收文件（POD签收/快递签收）' },
+] as const
+export type DeliveryDocumentCategory = typeof deliveryDocumentCategories[number]['category']
+export interface DeliveryDocumentFile { fileId: string; fileName: string; contentType: string | null; sizeBytes: number; uploadedAt: string }
+export interface DeliveryDocumentCategorySummary { category: DeliveryDocumentCategory; status: 'UPLOADED' | 'MISSING'; fileCount: number }
+export interface DeliveryDocumentSummary { uploadedCategoryCount: number; totalCategoryCount: number; categories: DeliveryDocumentCategorySummary[] }
+export interface DeliveryDocuments extends DeliveryDocumentSummary {
+  deliveryNo: string; customerId: string; version: number; bolNo: string | null
+  categories: Array<DeliveryDocumentCategorySummary & { files: DeliveryDocumentFile[] }>
+  allowedActions: string[]; replayed: boolean
+}
+export interface SaveDeliveryDocuments { expectedVersion: number; idempotencyKey: string; bolNo: string | null; documents: Array<{ category: DeliveryDocumentCategory; fileIds: string[] }> }
+const path = (deliveryNo: string) => `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}/documents`
+export async function getDeliveryDocuments(deliveryNo: string, customerId: string) {
+  return unwrapApiResponse(await overseasHttp.get<ApiEnvelope<DeliveryDocuments>, ApiEnvelope<DeliveryDocuments>>(path(deliveryNo), { params: { customerId } }))
+}
+export async function saveDeliveryDocuments(deliveryNo: string, customerId: string, body: SaveDeliveryDocuments) {
+  return unwrapApiResponse(await overseasHttp.put<ApiEnvelope<DeliveryDocuments>, ApiEnvelope<DeliveryDocuments>>(path(deliveryNo), body, { params: { customerId } }))
+}
+export async function uploadDeliveryDocument(deliveryNo: string, customerId: string, category: DeliveryDocumentCategory, file: File) {
+  const body = new FormData()
+  body.append('file', file)
+  return unwrapApiResponse(await overseasHttp.post<ApiEnvelope<DeliveryDocumentFile>, ApiEnvelope<DeliveryDocumentFile>>(`${path(deliveryNo)}/${category}/files`, body, { params: { customerId } }))
+}
+export async function downloadDeliveryDocument(deliveryNo: string, customerId: string, category: DeliveryDocumentCategory, fileId: string) {
+  return overseasHttp.get<Blob, Blob>(`${path(deliveryNo)}/${category}/files/${encodeURIComponent(fileId)}/download`, { params: { customerId }, responseType: 'blob' })
+}
@@ -28,7 +28,7 @@ describe('delivery order API', () => {
    await listDeliveryReturnInboundOptions('DEL/1', '1001')
    expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1/return-inbound-options', { params: { customerId: '1001' } })

-    const payload = { inboundOrderId: '9', reason: '客户拒收', returnDirection: 'OVERSEAS_WAREHOUSE', packageCount: 2 }
+    const payload = { inboundOrderId: '9', reason: '客户拒收', returnDirection: 'OVERSEAS_WAREHOUSE' as const, items: [{ outboundPalletItemId: '9007199254740995', inventoryPositionId: '9007199254740996', packageCount: 2 }], idempotencyKey: 'return-1' }
    vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', data: { id: '19', exceptionNo: 'EXC-1', status: 'PENDING' } })
    await markDeliveryReturn('DEL/1', '1001', payload)
    expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1/mark-return', payload, { params: { customerId: '1001' } })
@@ -1,7 +1,7 @@
 import { overseasHttp } from '@/shared/api/overseasHttp'
 import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'
-import type { ExceptionRelation } from './exceptionOrders'
+import type { DeliveryDocumentSummary } from './deliveryDocuments'

 export interface DeliveryOrderQuery {
  page: number
@@ -20,6 +20,10 @@ export interface DeliveryOrderQuery {
 }

 export interface DeliveryOrderRow {
+  version: number
+  allowedActions: string[]
+  bolNo?: string | null
+  documentSummary?: DeliveryDocumentSummary
  id: string
  customerId: string
  customerName?: string | null
@@ -58,6 +62,29 @@ export interface DeliveryFeeRow { id: string; feeDirection: string; feeType: str
 export interface DeliveryOperationRow { id: string; operatedAt: string; operationNode: string; operatorName?: string | null; result: string }
 export interface DeliveryOrderDetail { order: DeliveryOrderRow; skus: DeliverySkuRow[]; fees: DeliveryFeeRow[]; operations: DeliveryOperationRow[] }

+export interface DeliveryReturnSource {
+  outboundPalletItemId: string
+  inventoryPositionId: string
+  palletNo?: string | null
+  skuCode?: string | null
+  maxReturnPackages: number
+}
+export interface DeliveryReturnRelation {
+  inboundOrderId: string
+  inboundCode?: string | null
+  lastMileOrderNo?: string | null
+  customerId: string
+  returnSources: DeliveryReturnSource[]
+}
+export interface MarkDeliveryReturnPayload {
+  inboundOrderId: string
+  reason: string
+  returnDirection: 'OVERSEAS_WAREHOUSE' | 'CUSTOMER' | 'OTHER'
+  returnLogisticsNo?: string
+  items: Array<{ outboundPalletItemId: string; inventoryPositionId: string; packageCount: number }>
+  idempotencyKey: string
+}
+
 export async function listDeliveryOrders(query: DeliveryOrderQuery) {
  const { customerId, ...params } = query
  const response = await overseasHttp.get<ApiEnvelope<OverseasPagePayload<DeliveryOrderRow>>, ApiEnvelope<OverseasPagePayload<DeliveryOrderRow>>>(
@@ -74,13 +101,13 @@ export async function getDeliveryOrder(deliveryNo: string, customerId: string) {
 }

 export async function listDeliveryReturnInboundOptions(deliveryNo: string, customerId: string) {
-  const response = await overseasHttp.get<ApiEnvelope<ExceptionRelation[]>, ApiEnvelope<ExceptionRelation[]>>(
+  const response = await overseasHttp.get<ApiEnvelope<DeliveryReturnRelation[]>, ApiEnvelope<DeliveryReturnRelation[]>>(
    `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}/return-inbound-options`, { params: { customerId } },
  )
  return unwrapApiResponse(response)
 }

-export async function markDeliveryReturn(deliveryNo: string, customerId: string, payload: { inboundOrderId: string; reason: string; returnDirection: string; returnLogisticsNo?: string; packageCount?: number; skuCode?: string }) {
+export async function markDeliveryReturn(deliveryNo: string, customerId: string, payload: MarkDeliveryReturnPayload) {
  const response = await overseasHttp.post<ApiEnvelope<{ id: string; exceptionNo: string; status: string }>, ApiEnvelope<{ id: string; exceptionNo: string; status: string }>>(
    `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}/mark-return`, payload, { params: { customerId } },
  )
@@ -37,6 +37,9 @@ export interface InboundOrderSummaryDto {
  pickedPackageCount?: number | null
  volumeCbm?: number | null
  palletCount?: number | null
+  assigned?: boolean | null
+  mergeAllowed?: boolean | null
+  urgent?: boolean | null
  status?: string | null
  appointmentNo?: string | null
  appointmentStatus?: string | null
@@ -114,11 +114,17 @@ describe('last-mile order overseas API', () => {

  it('uses one atomic container request without looping individual conversions', async () => {
    vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: [] })
-    await expect(convertLastMileContainerToInboundPlans({ sourceContainerBookingId: '2092873463568597001' })).resolves.toEqual([])
+    await expect(convertLastMileContainerToInboundPlans({
+      sourceContainerBookingId: '2092873463568597001',
+      snapshotVersion: 9,
+      snapshotHash: 'a'.repeat(64),
+    }, 'container-plan-idempotency-key')).resolves.toEqual([])
    expect(overseasHttp.post).toHaveBeenCalledTimes(1)
    expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/inbound-plans/convert-container', {
      sourceContainerBookingId: '2092873463568597001',
-    })
+      snapshotVersion: 9,
+      snapshotHash: 'a'.repeat(64),
+    }, { headers: { 'Idempotency-Key': 'container-plan-idempotency-key' } })
  })

  it('loads server-side container progress with pagination and filters', async () => {
@@ -210,6 +210,66 @@ export interface ContainerPlanProgressDetailDto {

 export interface ConvertContainerInboundPlanPayload {
  sourceContainerBookingId: string
+  snapshotVersion: number
+  snapshotHash: string
+}
+
+export type ContainerInboundPlanPreviewReadiness = 'READY' | 'PLANNED' | 'BLOCKED'
+
+export interface ContainerInboundPlanPreviewOrderDto {
+  customerId: string
+  customerName: string | null
+  orderId: string
+  businessOrderNo: string
+  inboundCode: string | null
+  orderType: string
+  destinationType: 'FBA' | 'ONE_CLICK_DROPSHIP' | 'PRIVATE_ADDRESS'
+  destinationWarehouseId: string | null
+  destinationWarehouseCode: string | null
+  destinationWarehouseName: string | null
+  packageCount: number
+  volumeCbm: number
+  suggestedPalletCount: number | null
+  plannedPalletCount: number | null
+  existingPlanNo: string | null
+  planStatus: string | null
+  orderVersion: number
+  readiness: ContainerInboundPlanPreviewReadiness
+  blockers: string[]
+}
+
+export interface ContainerInboundPlanPreviewGroupDto {
+  destinationType: 'FBA' | 'ONE_CLICK_DROPSHIP' | 'PRIVATE_ADDRESS'
+  destinationWarehouseId: string | null
+  destinationWarehouseCode: string | null
+  destinationWarehouseName: string | null
+  orderCount: number
+  pendingOrderCount: number
+  pendingPalletCount: number
+  existingPlannedPalletCount: number
+  suggestedPalletCount: number
+  plannedPalletCount: number
+  orders: ContainerInboundPlanPreviewOrderDto[]
+}
+
+export interface ContainerInboundPlanPreviewDto {
+  sourceContainerBookingId: string
+  containerNo: string | null
+  overseasWarehouseId: string | null
+  overseasWarehouseCode: string | null
+  overseasWarehouseName: string | null
+  snapshotVersion: number
+  snapshotHash: string
+  totalOrderCount: number
+  readyOrderCount: number
+  blockedOrderCount: number
+  pendingOrderCount: number
+  pendingPalletCount: number
+  existingPlannedPalletCount: number
+  totalSuggestedPalletCount: number
+  totalPlannedPalletCount: number
+  ready: boolean
+  groups: ContainerInboundPlanPreviewGroupDto[]
 }

 export type ManualNodeCode =
@@ -394,9 +454,18 @@ export async function changeContainerReceivingWarehouse(
  return unwrapApiResponse(response)
 }

-export async function convertLastMileContainerToInboundPlans(payload: ConvertContainerInboundPlanPayload) {
+export async function getContainerInboundPlanPreview(sourceContainerBookingId: string) {
+  const response = await overseasHttp.get<ApiEnvelope<ContainerInboundPlanPreviewDto>, ApiEnvelope<ContainerInboundPlanPreviewDto>>(
+    '/platform/v1/last-leg/inbound-plans/container-preview',
+    { params: { sourceContainerBookingId } },
+  )
+  return unwrapApiResponse(response)
+}
+
+export async function convertLastMileContainerToInboundPlans(payload: ConvertContainerInboundPlanPayload, idempotencyKey: string) {
  const response = await overseasHttp.post<ApiEnvelope<InboundPlanDetailDto[]>, ApiEnvelope<InboundPlanDetailDto[]>>(
    '/platform/v1/last-leg/inbound-plans/convert-container', payload,
+    { headers: { 'Idempotency-Key': idempotencyKey } },
  )
  return unwrapApiResponse(response)
 }