修改获取可提取吨数方法的逻辑计算

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

@@ -63,15 +63,21 @@ public class OrderWeightServiceImpl implements OrderWeightService {
         BigDecimal platOrderGoodsWeight = BigDecimal.ZERO;
 
         for (OrderGoods item : orderGoodsList) {
-            BigDecimal weight;   //取消，完成，完结的货单取 已拉运吨数 作为提取吨数，
+            //取消，完成，完结的货单取 已拉运吨数 作为提取吨数，
+            BigDecimal weight;
             if(Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.CANCEL.getCode())
                 || Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.SUCCESS.getCode())
                     || Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.COMPLETED.getCode())){
                 weight = item.getAlreadyTransportWeight();
             }else{
-                weight = item.getExtractWeight();
+                //货单的已拉运吨数大于提取吨数，使用已拉运吨数作为提取吨数
+                if(item.getExtractWeight().compareTo
+                        (Objects.nonNull(item.getAlreadyLoadWeight())?item.getAlreadyLoadWeight():BigDecimal.ZERO) >=0){
+                    weight = item.getExtractWeight();
+                }else{
+                    weight = item.getAlreadyTransportWeight();
+                }
             }
-
             if(Objects.equals(item.getVehicleUsage(), VehicleUsageEnum.Status.OWN.getCode())){
                 ownOrderGoodsWeight = ownOrderGoodsWeight.add(weight);
             }