提交 7a7e45a5 authored 作者: huyufan's avatar huyufan

修改BUG

上级 fcd91bc7
...@@ -300,6 +300,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService { ...@@ -300,6 +300,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
//归还吨数 //归还吨数
RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam(); RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
rollbackOrderWeightParam.setOrderNo(param.getOrderNo()); rollbackOrderWeightParam.setOrderNo(param.getOrderNo());
log.info("falg:{}",flag);
if (flag > 0) { if (flag > 0) {
orderGoodsParams.setResidueTransportWeight(oldOrderGoods.getResidueTransportWeight().add(answer)); orderGoodsParams.setResidueTransportWeight(oldOrderGoods.getResidueTransportWeight().add(answer));
...@@ -313,7 +314,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService { ...@@ -313,7 +314,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
rollbackOrderWeightParam.setOwnResidueCarryWeight(answer); rollbackOrderWeightParam.setOwnResidueCarryWeight(answer);
rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO); rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
} }
}else { }else if (flag < 0 ){
orderGoodsParams.setResidueTransportWeight(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getAlreadyTransportWeight())); orderGoodsParams.setResidueTransportWeight(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getAlreadyTransportWeight()));
rollbackOrderWeightParam.setUpdateType(UpdateEnum.ADD.getCode()); rollbackOrderWeightParam.setUpdateType(UpdateEnum.ADD.getCode());
if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) { if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
...@@ -326,6 +327,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService { ...@@ -326,6 +327,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO); rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
} }
} }
log.info("回填吨数:{}", JSONUtil.parse(rollbackOrderWeightParam));
orderFeign.rollbackOrderWeight(rollbackOrderWeightParam); orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
if (new BigDecimal(orderInfoFeign.getResidueWeight()).compareTo(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getExtractWeight())) < 0) { if (new BigDecimal(orderInfoFeign.getResidueWeight()).compareTo(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getExtractWeight())) < 0) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论