|
@@ -316,17 +316,18 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
|
|
BigDecimal roughWeight = packDetailList.stream().map(PackDetail::getRoughWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
BigDecimal roughWeight = packDetailList.stream().map(PackDetail::getRoughWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
BigDecimal netWeight = packDetailList.stream().map(PackDetail::getNetWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
BigDecimal netWeight = packDetailList.stream().map(PackDetail::getNetWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
- BigDecimal volume = packDetailList.stream().map(item -> {
|
|
|
|
- return item.getBoxLong().multiply(item.getBoxWide()).multiply(item.getBoxHigh());
|
|
|
|
- }).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
+ BigDecimal volume = packDetailList.stream().map(item -> item
|
|
|
|
+ .getBoxLong().multiply(item.getBoxWide())
|
|
|
|
+ .multiply(item.getBoxHigh()))
|
|
|
|
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
map.put("remark", shippingMark);
|
|
map.put("remark", shippingMark);
|
|
map.put("packQuantity", packQuantity);
|
|
map.put("packQuantity", packQuantity);
|
|
- map.put("roughWeight", roughWeight);
|
|
|
|
- map.put("netWeight", netWeight);
|
|
|
|
- map.put("volume", volume);
|
|
|
|
|
|
+ map.put("roughWeight", roughWeight.multiply(packQuantity));
|
|
|
|
+ map.put("netWeight", netWeight.multiply(packQuantity));
|
|
|
|
+ map.put("volume", volume.multiply(packQuantity));
|
|
map.put("packDetailList", packDetailVos);
|
|
map.put("packDetailList", packDetailVos);
|
|
|
|
|
|
return map;
|
|
return map;
|