commit

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

@@ -303,7 +303,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if (orderGoodsParams.getExtractWeight().compareTo(oldOrderGoods.getAlreadyTransportWeight()) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单提取吨数不能小于货单已拉运吨数");
         }
-        BigDecimal answer = orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getExtractWeight());
+        //考虑到借吨、恢复吨数的货单，逻辑判断实际的提取吨数
+        BigDecimal realExtractWeight = oldOrderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0?
+                oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getExtractWeight();
+        BigDecimal answer = orderGoodsParams.getExtractWeight().subtract(realExtractWeight);
         int flag = answer.compareTo(BigDecimal.ZERO);
         //归还吨数
         RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
@@ -695,6 +698,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     public OrderGoodsEditVO findOrderGoodsById(Integer id) {
         OrderGoodsEditVO result = new OrderGoodsEditVO();
         OrderGoodsVO orderGoodsVO = orderGoodsDao.findOrderGoodsById(id);
+        if(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) == 0 ){
+            //如果借吨或者恢复吨数，会导致提取吨数不准确，所以这里取准确提取吨数
+            orderGoodsVO.setExtractWeight(orderGoodsVO.getAlreadyTransportWeight());
+        }
         String orderNo = orderGoodsVO.getOrderNo();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         result.setOrderNo(orderInfoFeign.getOrderNo());