提交 050aa8b7 authored 作者: huyufan's avatar huyufan

修改代码

上级 75bb7e9a
...@@ -440,7 +440,7 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -440,7 +440,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
update.setId(orderGoods.getId()); update.setId(orderGoods.getId());
//TODO 补充批量更新接口 关闭货单状态 注意判断货单是已完结还是已完成 //TODO 补充批量更新接口 关闭货单状态 注意判断货单是已完结还是已完成
update.setResidueTransportWeight(BigDecimal.ZERO); update.setResidueTransportWeight(BigDecimal.ZERO);
update.setAlreadyTransportWeight(update.getAlreadyTransportWeight().subtract(sum)); update.setAlreadyTransportWeight(orderGoods.getAlreadyTransportWeight().subtract(sum));
// update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode()); // update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
orderGoodsDao.updateEntityByKey(update); orderGoodsDao.updateEntityByKey(update);
} }
...@@ -521,7 +521,7 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -521,7 +521,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
OrderGoods update = new OrderGoods(); OrderGoods update = new OrderGoods();
update.setId(orderGoods.getId()); update.setId(orderGoods.getId());
//TODO 补充批量更新接口 关闭货单状态 //TODO 补充批量更新接口 关闭货单状态
update.setAlreadyTransportWeight(update.getAlreadyTransportWeight().subtract(sum)); update.setAlreadyTransportWeight(orderGoods.getAlreadyTransportWeight().subtract(sum));
update.setResidueTransportWeight(BigDecimal.ZERO); update.setResidueTransportWeight(BigDecimal.ZERO);
//update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode()); //update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
orderGoodsDao.updateEntityByKey(update); orderGoodsDao.updateEntityByKey(update);
...@@ -887,7 +887,7 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -887,7 +887,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream() BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream()
.map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); .map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
update.setAlreadyTransportWeight( update.setAlreadyTransportWeight(
update.getAlreadyTransportWeight() orderGoods.getAlreadyTransportWeight()
.subtract( .subtract(
childSum childSum
) )
...@@ -911,7 +911,7 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -911,7 +911,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream() BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream()
.map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); .map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
update.setAlreadyTransportWeight( update.setAlreadyTransportWeight(
update.getAlreadyTransportWeight() orderGoods.getAlreadyTransportWeight()
.subtract( .subtract(
childSum childSum
) )
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论