优化

src/modules/overseas-warehouse/api/dispatches.ts

@@ -177,6 +177,7 @@ export interface DispatchPdaItemDto {
   destinationWarehouseCode?: string | null
   destinationWarehouseName?: string | null
   fbaWarehouseCode?: string | null
+  warehouseRouteLabel?: string | null
   scheduledPackages: number
   pickedPackages: number
   positions: DispatchPdaPositionDto[]

src/modules/overseas-warehouse/api/lastMileOrders.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { overseasHttp } from '@/shared/api/overseasHttp'
-import { convertLastMileOrderToInboundPlan, getLastMileOrder, listLastMileOrders, setLastMileOrderDetained, setLastMileOrderPalletMergeRequired, transferLastMileOrders } from './lastMileOrders'
+import { convertLastMileOrderToInboundPlan, downloadLastMileOrders, getLastMileOrder, listLastMileOrders, setLastMileOrderDetained, setLastMileOrderPalletMergeBatch, setLastMileOrderPalletMergeRequired, transferLastMileOrders } from './lastMileOrders'
 
 vi.mock('@/shared/api/overseasHttp', () => ({ overseasHttp: { get: vi.fn(), put: vi.fn(), post: vi.fn() } }))
 
@@ -47,6 +47,38 @@ describe('last-mile order overseas API', () => {
     expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/orders/destination', expect.objectContaining({ orderIds: ['190000000000000099'] }))
   })
 
+  it('returns the exported CSV blob without reading data twice', async () => {
+    const blob = new Blob(['orders'], { type: 'text/csv' })
+    vi.mocked(overseasHttp.get).mockResolvedValue(blob)
+
+    await expect(downloadLastMileOrders({ orderNo: 'LM-1' })).resolves.toBe(blob)
+    expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/orders/export', {
+      params: { orderNo: 'LM-1' }, responseType: 'blob',
+    })
+  })
+
+  it('exports all authorized orders without pagination or empty filters', async () => {
+    const blob = new Blob(['orders'], { type: 'text/csv' })
+    vi.mocked(overseasHttp.get).mockResolvedValue(blob)
+
+    await downloadLastMileOrders({ page: 1, size: 10, orderNo: '', createdFrom: undefined })
+
+    expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/orders/export', {
+      params: {}, responseType: 'blob',
+    })
+  })
+
+  it('rejects a JSON business error instead of saving it as CSV', async () => {
+    const blob = new Blob([JSON.stringify({
+      code: 'S0500', message: '系统内部错误', data: null, requestId: 'req-1', traceId: 'trace-1',
+    })], { type: 'application/json' })
+    vi.mocked(overseasHttp.get).mockResolvedValue(blob)
+
+    await expect(downloadLastMileOrders({})).rejects.toMatchObject({
+      code: 'S0500', message: '系统内部错误', requestId: 'req-1', traceId: 'trace-1',
+    })
+  })
+
   it('uses the order hold endpoint with the required operation remark', async () => {
     vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', message: 'success', data: null })
     await setLastMileOrderDetained('190000000000000099', { detained: true, remark: '等待质检确认' })
@@ -63,6 +95,14 @@ describe('last-mile order overseas API', () => {
     })
   })
 
+  it('marks selected orders as one visible pallet-merge group', async () => {
+    vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', message: 'success', data: null })
+    await setLastMileOrderPalletMergeBatch(['11', '12'], true)
+    expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/orders/pallet-merge-required/batch', {
+      orderIds: ['11', '12'], palletMergeRequired: true,
+    })
+  })
+
   it('uses the inbound-plan conversion endpoint without customerId', async () => {
     vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: {} })
     await convertLastMileOrderToInboundPlan({ orderId: '190000000000000099' })

src/modules/overseas-warehouse/api/lastMileOrders.ts

@@ -1,5 +1,5 @@
 import { overseasHttp } from '@/shared/api/overseasHttp'
-import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import { ApiResponseError, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 
 export interface OverseasPageResult<T> {
   records: T[]
@@ -74,7 +74,7 @@ export interface LastMileOrderSummaryDto {
   palletMergeFlag?: string | null
   /** Optional grouping facts returned by newer last-leg services. */
   palletMergeBatchId?: string | null
-  palletMergeOrderNos?: string[] | null
+  palletMergeInboundNos?: string[] | null
   currentStatus?: string | null
   privateRemark?: string | null
   customerRemark?: string | null
@@ -188,8 +188,26 @@ export async function getLastMileOrder(orderId: string) {
 }
 
 export async function downloadLastMileOrders(query: Partial<LastMileOrderQuery>) {
-  const response = await overseasHttp.get<Blob>('/platform/v1/last-leg/orders/export', { params: query, responseType: 'blob' })
-  return response.data
+  const { page: _page, size: _size, ...filters } = query
+  const params = Object.fromEntries(
+    Object.entries(filters).filter(([, value]) => value !== undefined && value !== null && value !== ''),
+  )
+  const blob = await overseasHttp.get<Blob, Blob>('/platform/v1/last-leg/orders/export', { params, responseType: 'blob' })
+  if (!blob.type.toLowerCase().includes('json')) return blob
+  let error: Partial<ApiEnvelope<unknown>>
+  try {
+    error = JSON.parse(await blob.text()) as Partial<ApiEnvelope<unknown>>
+  } catch {
+    throw new ApiResponseError('导出接口返回了非 CSV 内容', 'INVALID_EXPORT_RESPONSE')
+  }
+  throw new ApiResponseError(
+    error.message || '尾程订单导出失败',
+    error.code || 'INVALID_EXPORT_RESPONSE',
+    undefined,
+    error.data,
+    error.requestId,
+    error.traceId,
+  )
 }
 
 export async function createLastMileOrderFee(orderId: string, payload: CreateLastMileFeePayload) {
@@ -226,3 +244,10 @@ export async function setLastMileOrderPalletMergeRequired(orderId: string, paylo
   )
   return unwrapApiResponse(response)
 }
+
+export async function setLastMileOrderPalletMergeBatch(orderIds: string[], palletMergeRequired: boolean) {
+  const response = await overseasHttp.put<ApiEnvelope<void>, ApiEnvelope<void>>(
+    '/platform/v1/last-leg/orders/pallet-merge-required/batch', { orderIds, palletMergeRequired },
+  )
+  return unwrapApiResponse(response)
+}