Merge origin/dev into release/test preserving current workflows

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

@@ -12,8 +12,8 @@ export interface DispatchQuery {
 }
 
 export interface DispatchPalletCandidateDto {
-  planId: string
-  planPalletId: string
+  planId?: string | null
+  planPalletId?: string | null
   warehousePalletId?: string | null
   orderId: string
   customerId?: string | null
@@ -36,8 +36,9 @@ export interface DispatchPalletCandidateDto {
   fbaWarehouseCode?: string | null
   packageCount?: number | null
   volumeCbm?: number | null
-  sourceStage?: 'PLAN' | 'RECEIVED' | null
+  sourceStage?: 'PLAN' | 'RECEIVED' | 'RELABEL' | null
   cartonMarks?: string | null
+  relabelCartonMarks?: string | null
 }
 
 export interface DispatchCandidateQuery {
@@ -57,6 +58,7 @@ export interface PreArrangeDispatchPayload {
   fbaAppointmentStatus?: string
   vehicleAppointmentStatus?: string
   draftToken?: string
+  relabelNo?: string
 }
 
 export interface DispatchSummaryDto {
@@ -166,6 +168,13 @@ export async function cancelDispatch(dispatchNo: string) {
   return unwrapApiResponse(response)
 }
 
+export async function removeDispatchItem(dispatchNo: string, itemId: string) {
+  const response = await overseasHttp.delete<ApiEnvelope<DispatchSummaryDto>, ApiEnvelope<DispatchSummaryDto>>(
+    `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}/items/${encodeURIComponent(itemId)}`,
+  )
+  return unwrapApiResponse(response)
+}
+
 export async function listDispatchCandidates(query: DispatchCandidateQuery) {
   const response = await overseasHttp.get<ApiEnvelope<DispatchPalletCandidateDto[]>, ApiEnvelope<DispatchPalletCandidateDto[]>>(
     '/platform/v1/last-leg/dispatches/candidates',