修改履约进度表的挂单吨数计算

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

@@ -19,10 +19,7 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.PerformanceProgressDao;
 import com.clx.performance.dao.PerformanceProgressLogDao;
 import com.clx.performance.dto.gd.GdRouteDTO;
-import com.clx.performance.enums.OrderChildEnum;
-import com.clx.performance.enums.OrderEnum;
-import com.clx.performance.enums.PerformanceProgressEnum;
-import com.clx.performance.enums.ResultEnum;
+import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.AddressService;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
@@ -452,7 +449,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             //最后一个挂单中的货单的挂单时间为最早的挂单时间
             firstPendingTime = item.getPendingOrderTime();
 
-            pendingWeight = pendingWeight.add(item.getExtractWeight());
+            pendingWeight = pendingWeight.add(calcPendingWeight(item));
 
         }
         PerformanceProgress update = new PerformanceProgress();
@@ -463,6 +460,17 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         update.setPendingWeight(pendingWeight);
         performanceProgressDao.updateEntityByKey(update);
     }
+
+    //计算履约进度表货单的挂单吨数
+    private BigDecimal calcPendingWeight(OrderGoods item){
+        if(Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+            return Objects.nonNull(item.getAlreadyTransportWeight())?item.getAlreadyTransportWeight():BigDecimal.ZERO;
+        }
+        return item.getExtractWeight();
+    }
+
+
+
     //履约进度表----运单部分
     @Override
     public void dealPerformanceProgress4OrderChild(OrderChild data) {