merge release test changes and preserve local frontend updates

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

@@ -1,18 +1,20 @@
-import { overseasApiRequest } from '@/api/overseasHttp'
+import { overseasApiRequest, overseasBlobRequest } from '@/api/overseasHttp'
 import type { PageResult } from './warehouseServices'
 
 export interface ReturnOrderSummary {
   returnNo: string; overseasWarehouseId: string; warehouseContactName?: string; warehouseContactPhone?: string; customerReferenceNo?: string; status: string
-  skuTypes: number; expectedQuantity: number; receivedQuantity: number; needRelabel: boolean; createdAt: string
+  skuTypes: number; expectedQuantity: number; receivedQuantity: number; needRelabel: boolean; relabelNo?: string; relabelStatus?: string; createdAt: string
 }
 export interface ReturnOrderItem {
   skuCode: string; productNameZh?: string; expectedQuantity: number; receivedQuantity: number
 }
 export interface ReturnReceipt {
-  receiptNo: string; receiptBatchNo: string; cartonMark?: string; trackingNo?: string; startedBy: 'RETURN_NO' | 'SKU'
+  receiptNo: string; receiptBatchNo: string; palletCode: string; trackingNo?: string; startedBy: 'RETURN_NO' | 'SKU'
   receivedQuantity: number; operatorName?: string; signedAt: string
 }
-export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[] }
+export interface ReturnPallet { palletCode: string; skuTypes: number; totalQuantity: number; items: Array<{ skuCode: string; productNameZh?: string; quantity: number }> }
+export interface ReturnPhoto { fileId: number; fileName: string; contentType: string; sizeBytes: number }
+export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[]; pallets: ReturnPallet[]; photos: ReturnPhoto[] }
 export interface ReturnOrderCreate {
   overseasWarehouseId: string; warehouseContactName: string; warehouseContactPhone: string; customerReferenceNo?: string; remark?: string; needRelabel: boolean; idempotencyKey: string
   items: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number }>
@@ -27,3 +29,21 @@ export function getReturnOrder(returnNo: string) {
 export function createReturnOrder(payload: ReturnOrderCreate) {
   return overseasApiRequest<ReturnOrderDetail>({ method: 'POST', url: '/merchant/v1/last-leg/return-orders', data: payload })
 }
+export function updateReturnOrder(returnNo: string, payload: ReturnOrderCreate) {
+  return overseasApiRequest<ReturnOrderDetail>({ method: 'PUT', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}`, data: payload })
+}
+export interface ReturnRelabelCreate {
+  fileScope: 'CARTON_TOTAL' | 'SKU_TOTAL'; destinationFbaWarehouseId: string; destinationFbaWarehouseCode: string; cartonRemark?: string; idempotencyKey: string
+  items: Array<{ skuCode: string; quantity: number }>
+}
+export interface ReturnRelabelCreated { relabelNo: string; relabelApplicationId: string; returnNo: string; skuCodes: string[]; status: string }
+export function createReturnRelabel(returnNo: string, payload: ReturnRelabelCreate) {
+  return overseasApiRequest<ReturnRelabelCreated>({ method: 'POST', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/relabel`, data: payload })
+}
+export function uploadReturnRelabelFile(relabelNo: string, scope: 'CARTON_TOTAL' | 'SKU_TOTAL', file: File) {
+  const data = new FormData(); data.append('file', file)
+  return overseasApiRequest<unknown>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files`, params: { scope }, data, headers: { 'Content-Type': 'multipart/form-data' } })
+}
+export function downloadReturnPhoto(returnNo: string, fileId: string | number) {
+  return overseasBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/photos/${encodeURIComponent(String(fileId))}/download` })
+}

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

@@ -29,7 +29,7 @@ export interface RelabelInventoryCandidate {
   inventoryBalanceId: string; inboundOrderId: string; inboundOrderNo?: string; inboundCode?: string
   overseasWarehouseId: string; overseasWarehouseCode?: string; overseasWarehouseName?: string
   destinationFbaWarehouseCode?: string; destinationFbaWarehouseName?: string; skuCode?: string; productNameZh?: string
-  availablePackages: number; version: number
+  availablePackages: number | string; version: number
   positions: Array<{ positionId: string; palletNo?: string; batchNo?: string; warehouseLocationCode?: string; availablePackages: number }>
   sourceType?: 'INBOUND' | 'RETURN_CARTON'; returnCartonId?: string; cartonMark?: string
   skuItems?: Array<{ skuCode: string; newSkuCode?: string; quantity: number; remark?: string }>