提交 6e7dc242 authored 作者: liuhaiquan's avatar liuhaiquan

Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test

# Conflicts: # performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
......@@ -314,6 +314,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
BigDecimal realExtractWeight = oldOrderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0?
oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getAlreadyTransportWeight().add(oldOrderGoods.getResidueTransportWeight());
oldOrderGoods.setExtractWeight(realExtractWeight);
//本次提取增加或者减少的吨数 = 本次提取的吨数 - 货单原实际提取吨数
BigDecimal answer = orderGoodsParams.getExtractWeight().subtract(realExtractWeight);
int flag = answer.compareTo(BigDecimal.ZERO);
......@@ -367,6 +368,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
} else {
//当编辑吨数等于0 的时候,不进行拦截
orderGoodsParams.setResidueTransportWeight(oldOrderGoods.getResidueTransportWeight());
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论