复核-大件单-sku合并

src/views/outbound/check/large/index.vue

@@ -418,7 +418,7 @@ const resetPackingStatus=()=>{
 //重置装箱
 const packingListRef=ref(null)
 const resetPacking=()=>{
-  packingListRef.value?.show(packingDetailMap.value,orderDetail.value)
+  _getOrderPacking(orderDetail.value.orderNo,1)
 }
 
 //重新开始
@@ -569,25 +569,35 @@ const _reversePicking = () => {
     closeLoading()
   })
 }
-const _getOrderPacking=(orderNo)=>{
+const _getOrderPacking=(orderNo,type)=>{
+  showLoading()
   getOrderPacking({ warehouse, orderNo }).then(res => {
     const mergedList = Object.values(
       res.data.reduce((acc, item) => {
-        const { sku, qty } = item;
-        acc[sku] = acc[sku] || { ...item, qty: 0 }
-        acc[sku].qty += qty;
+        const { sku, traceId, qty } = item
+        const compositeKey = `${sku}_${traceId}`
+        if (!acc[compositeKey]) {
+          acc[compositeKey] = { ...item }
+        } else {
+          acc[compositeKey].qty += qty
+        }
         return acc;
       }, {})
-    );
+    )
     packingDetailMap.value = mergedList.reduce((acc, item) => {
-      const { traceId } = item;
+      const { traceId } = item
       acc[traceId] = acc[traceId] || []
-      acc[traceId].push(item);
-      return acc;
+      acc[traceId].push(item)
+      return acc
     }, {});
+    if(type && type==1){
+      packingListRef.value?.show(packingDetailMap.value,orderDetail.value)
+    }
   }).catch(err => {
-    packingDetailMap.value = {};
-  });
+    packingDetailMap.value = {}
+  }).finally(f=>{
+    closeLoading()
+  })
 }
 const rowStyle=( row )=>{
   if(row.isPacking){