Merge remote-tracking branch 'origin/release/test' into release/test

# Conflicts: # src/modules/overseas-warehouse/views/WarehouseServiceView.vue
2026-09-23 10:27:47 +08:00
parent 25db3c1777 5de5f30b20
commit 06e0598e39
14 changed files with 104 additions and 28 deletions
@@ -33,7 +33,7 @@ export interface RelabelInventoryCandidate {
  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 }>
+  skuItems?: Array<{ skuCode: string; newSkuCode?: string; quantity: number; remark?: string }>; relabelledPackages?: number
 }

 export interface TransferCreate {