fix(dispatch): preserve return sources when restoring prearrangement drafts

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

@@ -5,6 +5,21 @@ import { cancelDispatch, createDispatchDraftContainer, deleteDispatchDraftContai
 vi.mock('@/shared/api/http', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/shared/api/http')>()), http: { get: vi.fn(), post: vi.fn(), put: vi.fn(), delete: vi.fn() } }))
 
 describe('dispatch overseas API', () => {
+  it('locks and submits actual return receipts without pretending they are plan pallets', async () => {
+    vi.mocked(http.post).mockResolvedValue({ code: '200', data: null })
+    await lockDispatchDraftPallet('RETURN:190000000000000099', 'draft-return', 'container-1')
+    expect(http.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/draft-locks/lock', {
+      sourceType: 'RETURN_RECEIPT', returnReceiptId: '190000000000000099', draftToken: 'draft-return', draftContainerId: 'container-1',
+    })
+    await unlockDispatchDraftPallet('RETURN:190000000000000099', 'draft-return')
+    expect(http.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/draft-locks/unlock', {
+      sourceType: 'RETURN_RECEIPT', returnReceiptId: '190000000000000099', draftToken: 'draft-return',
+    })
+    await preArrangeDispatch({ planPalletIds: [], returnReceiptIds: ['190000000000000099'], draftToken: 'draft-return' })
+    expect(http.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/pre-arrange', {
+      planPalletIds: [], returnReceiptIds: ['190000000000000099'], draftToken: 'draft-return',
+    })
+  })
   it('reads external freight from the scoped dispatch without a supplied customer', async () => {
     vi.mocked(http.get).mockResolvedValue({ code: '200', data: { snapshotHash: 'hash', requiresDeliveryFee: false, quotes: [] } })
     expect(await getDispatchExternalFreight('DP/1')).toEqual({ snapshotHash: 'hash', requiresDeliveryFee: false, quotes: [] })

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

@@ -12,6 +12,9 @@ export interface DispatchQuery {
 }
 
 export interface DispatchPalletCandidateDto {
+  sourceType?: 'INBOUND_PLAN' | 'RETURN_RECEIPT'
+  returnReceiptId?: string | null
+  returnReceiptNo?: string | null
   planId?: string | null
   planPalletId?: string | null
   warehousePalletId?: string | null
@@ -60,6 +63,7 @@ export interface DispatchDraftDto { draftToken: string; containers?: DispatchDra
 
 export interface PreArrangeDispatchPayload {
   planPalletIds: string[]
+  returnReceiptIds?: string[]
   fbaAppointmentNo?: string
   fbaAppointmentStatus?: string
   vehicleAppointmentStatus?: string
@@ -198,9 +202,14 @@ export async function preArrangeDispatch(payload: PreArrangeDispatchPayload) {
   return unwrapApiResponse(response)
 }
 
-export async function lockDispatchDraftPallet(planPalletId: string, draftToken: string, draftContainerId?: string) {
+function draftSource(selection: string) {
+  return selection.startsWith('RETURN:')
+    ? { sourceType: 'RETURN_RECEIPT', returnReceiptId: selection.slice(7) }
+    : { planPalletId: selection }
+}
+export async function lockDispatchDraftPallet(selection: string, draftToken: string, draftContainerId?: string) {
   const response = await http.post<ApiEnvelope<null>, ApiEnvelope<null>>(
-    '/platform/v1/last-leg/dispatches/draft-locks/lock', { planPalletId, draftToken, ...(draftContainerId ? { draftContainerId } : {}) },
+    '/platform/v1/last-leg/dispatches/draft-locks/lock', { ...draftSource(selection), draftToken, ...(draftContainerId ? { draftContainerId } : {}) },
   )
   return unwrapApiResponse(response)
 }
@@ -218,9 +227,9 @@ export async function deleteDispatchDraftContainer(draftToken: string, container
   return unwrapApiResponse(response)
 }
 
-export async function unlockDispatchDraftPallet(planPalletId: string, draftToken: string) {
+export async function unlockDispatchDraftPallet(selection: string, draftToken: string) {
   const response = await http.post<ApiEnvelope<null>, ApiEnvelope<null>>(
-    '/platform/v1/last-leg/dispatches/draft-locks/unlock', { planPalletId, draftToken },
+    '/platform/v1/last-leg/dispatches/draft-locks/unlock', { ...draftSource(selection), draftToken },
   )
   return unwrapApiResponse(response)
 }