优化

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

@@ -4,14 +4,22 @@ import type { PageResult } from './warehouseServices'
 export interface ReturnInventoryItem {
   overseasWarehouseId: string; cartonMark: string; sourceBatchNo?: string; status: string; skuCode: string
   productNameZh?: string; quantity: number; cartonSkuTypes: number; cartonTotalQuantity: number; receivedAt: string
+  relabelledQuantity: number; remainingRelabelQuantity: number
 }
 
 export interface ReturnInventorySummaryItem {
   overseasWarehouseId: string; skuCode: string; productNameZh?: string
-  availableQuantity: number; cartonQuantity: number; updatedAt: string
+  totalQuantity: number; availableQuantity: number; relabelLockedQuantity: number; cartonQuantity: number; updatedAt: string
 }
 
-export interface ReturnInventoryCartonItem { skuCode: string; productNameZh?: string; quantity: number }
+export interface ReturnSkuConversion {
+  relabelNo: string; cartonMark: string; oldSkuCode: string; newSkuCode: string; quantity: number
+  status: 'APPLIED' | 'CONFIRMED' | 'REVERSED'; completedAt: string
+}
+export interface ReturnInventoryCartonItem {
+  skuCode: string; productNameZh?: string; quantity: number; availableQuantity: number
+  relabelledQuantity: number; remainingRelabelQuantity: number
+}
 
 export interface ReturnInventoryCartonSummary {
   cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; relabelStatus?: string; relabelledQuantity?: number; relabelReservedQuantity?: number; status: string
@@ -23,6 +31,7 @@ export function listReturnInventoryCartons(params: Record<string, unknown>) {
 }
 
 export interface ReturnInventoryCartonDetail {
+  skuConversions: ReturnSkuConversion[]
   cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; relabelStatus?: string; relabelledQuantity?: number; relabelReservedQuantity?: number; status: string
   skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; receivedAt: string; items: ReturnInventoryCartonItem[]
 }

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

@@ -28,6 +28,7 @@ export interface RelabelDetail {
 export interface DiscardSummary { id: string; discardNo: string; outboundNo?: string; inboundCodes: string; overseasWarehouseId: string; overseasWarehouseName: string; totalPackages: number; totalFee: number; currency: string; status: string; createdAt: string; completedAt?: string }
 export interface DiscardCandidate { orderId: string; sourceType?: 'DROPSHIP' | 'RETURN_CARTON'; returnCartonId?: string; cartonMark?: string; inboundCode: string; inboundOrderNo: string; overseasWarehouseId: string; overseasWarehouseName: string; availablePackages: number; skus: Array<{ skuCode: string; productName: string; availablePackages: number }> }
 export interface RelabelInventoryCandidate {
+  skuConversions?: import('./returnInventory').ReturnSkuConversion[]
   stockQuantity?: number; inventoryStatus?: string; occupiedRelabelNo?: string; mergedIntoCartonMarks?: string[]; hasOutbound?: boolean
   inventoryBalanceId: string; inboundOrderId: string; inboundOrderNo?: string; inboundCode?: string
   overseasWarehouseId: string; overseasWarehouseCode?: string; overseasWarehouseName?: string