修改货单编辑提取吨数取值问题

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -305,7 +305,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
         //考虑到借吨、恢复吨数的货单，逻辑判断实际的提取吨数
         BigDecimal realExtractWeight = oldOrderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0?
-                oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getExtractWeight();
+                oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getAlreadyTransportWeight().add(oldOrderGoods.getResidueTransportWeight());
         oldOrderGoods.setExtractWeight(realExtractWeight);
         BigDecimal answer = orderGoodsParams.getExtractWeight().subtract(realExtractWeight);
         int flag = answer.compareTo(BigDecimal.ZERO);
@@ -716,6 +716,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) == 0 ){
             //如果借吨或者恢复吨数，会导致提取吨数不准确，所以这里取准确提取吨数
             orderGoodsVO.setExtractWeight(orderGoodsVO.getAlreadyTransportWeight());
+        }else{
+            orderGoodsVO.setExtractWeight(orderGoodsVO.getAlreadyTransportWeight().add(orderGoodsVO.getResidueTransportWeight()));
         }
         String orderNo = orderGoodsVO.getOrderNo();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);