优化提交

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

@@ -3,7 +3,7 @@ import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'
 import type { DeliveryOrderRow } from './deliveryOrders'
 
-export interface OutboundRow { id: string; outboundNo: string; dispatchNo?: string | null; overseasWarehouseId?: string | null; lxCodes?: string | null; status?: string | null; palletCount?: number | null; packageCount?: number | null; createdAt?: string | null }
+export interface OutboundRow { id: string; outboundNo: string; dispatchNo?: string | null; overseasWarehouseId?: string | null; lxCodes?: string | null; status?: string | null; palletCount?: number | null; packageCount?: number | null; createdAt?: string | null; outboundType?: string | null }
 export interface OutboundPalletRow {
   id?: string | null
   palletNo?: string | null
@@ -18,6 +18,7 @@ export interface OutboundPalletRow {
 }
 export interface OutboundDetail { outbound: OutboundRow; pallets?: OutboundPalletRow[]; delivery?: DeliveryOrderRow | null }
 export interface OutboundQuery { page: number; size: number; documentNo?: string; lxCode?: string; warehouseId?: string; status?: string }
+export interface ReturnOutboundCandidate { returnNo?: string | null; overseasWarehouseId?: string | null; cartonMark?: string | null; fbaCartonMark?: string | null; destinationWarehouseCode?: string | null; destinationWarehouseName?: string | null; totalQuantity?: number | null; status?: string | null }
 export async function listOutbounds(query: OutboundQuery) {
   const response = await overseasHttp.get<ApiEnvelope<OverseasPagePayload<OutboundRow>>, ApiEnvelope<OverseasPagePayload<OutboundRow>>>('/platform/v1/last-leg/outbound-orders', { params: query })
   return normalizeOverseasPage(unwrapApiResponse(response))
@@ -30,6 +31,14 @@ export async function createOneClickDropshipOutbound(customerId: string, payload
   const response = await overseasHttp.post<ApiEnvelope<OutboundRow>, ApiEnvelope<OutboundRow>>('/platform/v1/last-leg/outbound-orders/one-click-dropship', payload, { params: { customerId } })
   return unwrapApiResponse(response)
 }
+export async function listReturnOutboundCandidates(customerId: string, warehouseId: string) {
+  const response = await overseasHttp.get<ApiEnvelope<ReturnOutboundCandidate[]>, ApiEnvelope<ReturnOutboundCandidate[]>>('/platform/v1/last-leg/outbound-orders/return/candidates', { params: { customerId, warehouseId } })
+  return unwrapApiResponse(response)
+}
+export async function createReturnOutbound(customerId: string, payload: { recipient: string; overseasWarehouseId: string; returnNo: string; cartonMarks: string[]; remark?: string; idempotencyKey: string }) {
+  const response = await overseasHttp.post<ApiEnvelope<OutboundRow>, ApiEnvelope<OutboundRow>>('/platform/v1/last-leg/outbound-orders/return', payload, { params: { customerId } })
+  return unwrapApiResponse(response)
+}
 export async function cancelOutbound(outboundNo: string, reason: string) {
   const response = await overseasHttp.post<ApiEnvelope<null>, ApiEnvelope<null>>(`/platform/v1/last-leg/outbound-orders/${encodeURIComponent(outboundNo)}/cancel`, { reason })
   return unwrapApiResponse(response)

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

@@ -64,6 +64,9 @@ export interface RelabelSummaryDto {
   totalPackageCount?: number | null
   notifiedPackageCount?: number | null
   skuCodes?: string | null
+  totalFileId?: string | null
+  totalFileName?: string | null
+  totalFileUrl?: string | null
   chargeAmount?: number | string | null
   chargeCurrency?: string | null
   walletStatus?: string | null
@@ -79,6 +82,7 @@ export interface RelabelItemDto {
   notifiedPackageCount?: number | null
   newSkuCode?: string | null
   labelRequirement?: string | null
+  relabelFileId?: string | null
   relabelFileName?: string | null
   relabelFileUrl?: string | null
   shipmentNo?: string | null
@@ -144,3 +148,20 @@ export async function changeRelabelOrderStatus(relabelNo: string, status: string
   )
   return unwrapApiResponse(response)
 }
+
+export async function uploadRelabelPdf(relabelNo: string, file: File, scope: 'TOTAL' | 'ITEM', itemId?: string) {
+  const body = new FormData()
+  body.append('file', file)
+  const response = await overseasHttp.post<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
+    `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files`, body,
+    { params: { scope, itemId }, headers: { 'Content-Type': 'multipart/form-data' } },
+  )
+  return unwrapApiResponse(response)
+}
+
+export async function downloadRelabelPdf(relabelNo: string, fileId: string, scope: 'TOTAL' | 'ITEM', itemId?: string) {
+  return overseasHttp.get<Blob, Blob>(
+    `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files/${encodeURIComponent(fileId)}/download`,
+    { params: { scope, itemId }, responseType: 'blob' },
+  )
+}

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

@@ -3,7 +3,7 @@ import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'
 
 export interface ReturnStockRow { customerId: string; overseasWarehouseId: string; skuCode: string; productNameZh?: string; totalQuantity: number; availableQuantity: number; cartonQuantity: number; updatedAt: string }
-export interface ReturnCartonRow { customerId: string; overseasWarehouseId: string; cartonMark: string; sourceReturnNo?: string; sourceBatchNo?: string; status: string; skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; createdAt: string }
+export interface ReturnCartonRow { customerId: string; overseasWarehouseId: string; cartonMark: string; sourceReturnNo?: string; sourceBatchNo?: string; status: string; fbaCartonMark?: string; destinationWarehouseCode?: string; destinationWarehouseName?: string; relabelNo?: string; relabelStatus?: string; skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; createdAt: string }
 export interface ReturnCartonDetail extends ReturnCartonRow { customerId: string; items: Array<{ skuCode: string; productNameZh?: string; quantity: number }> }
 export interface ReturnCartonLabel extends ReturnCartonDetail { printableHtml: string }
 export interface ReturnInventoryMovement { customerId: string; overseasWarehouseId: string; skuCode: string; productNameZh?: string; movementType: 'RECEIPT' | 'MERGE' | 'OUTBOUND'; referenceNo: string; totalDelta: number; availableDelta: number; occurredAt: string }