提交 b237a31b authored 作者: huyufan's avatar huyufan

还吨处理

上级 48ecb1a7
...@@ -774,6 +774,7 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -774,6 +774,7 @@ public class OrderChildServiceImpl implements OrderChildService {
private void updateReload(OrderChildLoadParam param, OrderChild orderChild, OrderGoods orderGoods) { private void updateReload(OrderChildLoadParam param, OrderChild orderChild, OrderGoods orderGoods) {
String childNo = param.getChildNo(); String childNo = param.getChildNo();
log.info("装车毛重:{}, 装车皮重:{}", param.getLoadRough(), param.getLoadTare());
BigDecimal loadNet = param.getLoadRough().subtract(param.getLoadTare()); BigDecimal loadNet = param.getLoadRough().subtract(param.getLoadTare());
if (loadNet.compareTo(new BigDecimal(99)) > 0) { if (loadNet.compareTo(new BigDecimal(99)) > 0) {
throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_NET_ERROR); throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_NET_ERROR);
...@@ -792,7 +793,7 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -792,7 +793,7 @@ public class OrderChildServiceImpl implements OrderChildService {
} }
BigDecimal dif = loadNet.subtract(orderChild.getLoadNet()); BigDecimal dif = loadNet.subtract(orderChild.getLoadNet());
log.info("dif:{}, loadNet:{}", dif, loadNet);
orderChild.setLoadRough(param.getLoadRough()); orderChild.setLoadRough(param.getLoadRough());
orderChild.setLoadTare(param.getLoadTare()); orderChild.setLoadTare(param.getLoadTare());
orderChild.setLoadNet(loadNet); orderChild.setLoadNet(loadNet);
...@@ -1605,6 +1606,7 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -1605,6 +1606,7 @@ public class OrderChildServiceImpl implements OrderChildService {
orderGoodsService.borrowWeight(orderGoods, childNo, orderGoods.getResidueTransportWeight(), dif, orderGoodsService.borrowWeight(orderGoods, childNo, orderGoods.getResidueTransportWeight(), dif,
dif.subtract(orderGoods.getResidueTransportWeight()), orderGoodsStatus); dif.subtract(orderGoods.getResidueTransportWeight()), orderGoodsStatus);
} else { } else {
log.info("货单吨数有剩余,归还吨数:{}", dif);
// 货单吨数够扣减,直接更新货单剩余吨数和已拉运吨数和状态 // 货单吨数够扣减,直接更新货单剩余吨数和已拉运吨数和状态
orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, orderGoodsStatus); orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, orderGoodsStatus);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论