优化

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, transferLastMileOrders } from './lastMileOrders'
+import { convertLastMileOrderToInboundPlan, getLastMileOrder, listLastMileOrders, setLastMileOrderDetained, setLastMileOrderPalletMergeRequired, transferLastMileOrders } from './lastMileOrders'
 
 vi.mock('@/shared/api/overseasHttp', () => ({ overseasHttp: { get: vi.fn(), put: vi.fn(), post: vi.fn() } }))
 
@@ -47,6 +47,22 @@ describe('last-mile order overseas API', () => {
     expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/orders/destination', expect.objectContaining({ orderIds: ['190000000000000099'] }))
   })
 
+  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: '等待质检确认' })
+    expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/orders/190000000000000099/detained', {
+      detained: true, remark: '等待质检确认',
+    })
+  })
+
+  it('marks an order for a PDA pallet-merge reminder', async () => {
+    vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', message: 'success', data: null })
+    await setLastMileOrderPalletMergeRequired('190000000000000099', { palletMergeRequired: true })
+    expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/orders/190000000000000099/pallet-merge-required', {
+      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

@@ -152,6 +152,15 @@ export interface ConvertInboundPlanPayload {
   orderId: string
 }
 
+export interface SetLastMileOrderDetainedPayload {
+  detained: boolean
+  remark: string
+}
+
+export interface SetLastMileOrderPalletMergePayload {
+  palletMergeRequired: boolean
+}
+
 export interface LastMileOrderDetailDto {
   order: LastMileOrderDto
   cargo: LastMileCargoDto[]
@@ -195,3 +204,17 @@ export async function convertLastMileOrderToInboundPlan(payload: ConvertInboundP
   )
   return unwrapApiResponse(response)
 }
+
+export async function setLastMileOrderDetained(orderId: string, payload: SetLastMileOrderDetainedPayload) {
+  const response = await overseasHttp.put<ApiEnvelope<void>, ApiEnvelope<void>>(
+    `/platform/v1/last-leg/orders/${encodeURIComponent(orderId)}/detained`, payload,
+  )
+  return unwrapApiResponse(response)
+}
+
+export async function setLastMileOrderPalletMergeRequired(orderId: string, payload: SetLastMileOrderPalletMergePayload) {
+  const response = await overseasHttp.put<ApiEnvelope<void>, ApiEnvelope<void>>(
+    `/platform/v1/last-leg/orders/${encodeURIComponent(orderId)}/pallet-merge-required`, payload,
+  )
+  return unwrapApiResponse(response)
+}

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

@@ -51,9 +51,9 @@ export async function listCustomerWarehouses() {
   return normalizeOverseasPage(unwrapApiResponse(response))
 }
 
-export async function listPallets(warehouseId: string, query: { page: number; size: number; keyword?: string; palletType?: string; status?: string }) {
+export async function listPallets(warehouseId: string | undefined, query: { page: number; size: number; keyword?: string; palletType?: string; status?: string }) {
   const response = await overseasHttp.get<ApiEnvelope<OverseasPagePayload<PalletDto>>, ApiEnvelope<OverseasPagePayload<PalletDto>>>(
-    `/platform/v1/warehouse-admin/${encodeURIComponent(warehouseId)}/pallets`,
+    warehouseId ? `/platform/v1/warehouse-admin/${encodeURIComponent(warehouseId)}/pallets` : '/platform/v1/warehouse-admin/pallets',
     { params: { ...query } },
   )
   return normalizeOverseasPage(unwrapApiResponse(response))

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

@@ -5,6 +5,7 @@ import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrder
 export interface RelabelOrderQuery {
   page: number
   size: number
+  relabelNo?: string
   skuCode?: string
   status?: string
 }