Skip to content

J
jiedao-api-boot-master
Commit ab17a968 authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-05-13修改BUG

parent 4a10d8c0
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java
View file @ ab17a968
...@@ -2967,7 +2967,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM ...@@ -2967,7 +2967,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
if(loadInfoList == null) loadInfoList = new ArrayList<>(); if(loadInfoList == null) loadInfoList = new ArrayList<>();
if(orderDOList == null) orderDOList = new HashSet<>(); if(orderDOList == null) orderDOList = new HashSet<>();
BoxGoodsStatistics boxGoodsStatistics = calculateByOrderList(loadInfoList, orderDOList); BoxGoodsStatistics boxGoodsStatistics = calculateByOrderList(loadInfoList, orderDOList);
calculateBoxMergeSum(shipmentMergeMap.get(shipmentId), boxGoodsStatistics); calculateBoxMergeSum(shipmentMergeMap.get(shipmentId), boxGoodsStatistics,shipmentId);
shipmentStatisticsMap.put(shipmentId, boxGoodsStatistics); shipmentStatisticsMap.put(shipmentId, boxGoodsStatistics);
} }
return shipmentStatisticsMap; return shipmentStatisticsMap;
...@@ -3026,10 +3026,11 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM ...@@ -3026,10 +3026,11 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
return boxPreloadGoodsMapper.orderPreloaded(query); return boxPreloadGoodsMapper.orderPreloaded(query);
} }
private void calculateBoxMergeSum(List<BoxMergePkgDO> mergePkgDOList, BoxGoodsStatistics boxGoodsStatistics) { private void calculateBoxMergeSum(List<BoxMergePkgDO> mergePkgDOList, BoxGoodsStatistics boxGoodsStatistics,long shipmentId) {
if(CollectionUtil.isEmpty(mergePkgDOList)) return; //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); BoxDO box = boxService.getBox(shipmentId);
if (!TransportTypeEnum.AIR.getType().equals(box.getTransportType())) { if (!TransportTypeEnum.AIR.getType().equals(box.getTransportType())) {
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment