2024-05-13修改BUG

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java

@@ -2967,7 +2967,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             if(loadInfoList == null) loadInfoList = new ArrayList<>();
             if(orderDOList == null) orderDOList = new HashSet<>();
             BoxGoodsStatistics boxGoodsStatistics = calculateByOrderList(loadInfoList, orderDOList);
-            calculateBoxMergeSum(shipmentMergeMap.get(shipmentId), boxGoodsStatistics);
+            calculateBoxMergeSum(shipmentMergeMap.get(shipmentId), boxGoodsStatistics,shipmentId);
             shipmentStatisticsMap.put(shipmentId, boxGoodsStatistics);
         }
         return shipmentStatisticsMap;
@@ -3026,10 +3026,11 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
         return boxPreloadGoodsMapper.orderPreloaded(query);
     }
 
-    private void calculateBoxMergeSum(List<BoxMergePkgDO> mergePkgDOList, BoxGoodsStatistics boxGoodsStatistics) {
-        if(CollectionUtil.isEmpty(mergePkgDOList)) return;
+    private void calculateBoxMergeSum(List<BoxMergePkgDO> mergePkgDOList, BoxGoodsStatistics boxGoodsStatistics,long shipmentId) {
+        //lanbm 2024-05-13 修改合包箱BUG
+        //if(CollectionUtil.isEmpty(mergePkgDOList)) return;
+        //Long shipmentId = mergePkgDOList.get(0).getShipmentId();
 
-        Long shipmentId = mergePkgDOList.get(0).getShipmentId();
         BoxDO box = boxService.getBox(shipmentId);
         if (!TransportTypeEnum.AIR.getType().equals(box.getTransportType())) {
             return;