Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test

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

@@ -418,7 +418,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         BigDecimal taskCompleteRatio ;    //任务完成率
         BigDecimal sumLoadWeight = BigDecimal.ZERO;    //矿发吨数
         BigDecimal sumUnloadWeight = BigDecimal.ZERO;    //到站吨数
-        BigDecimal sumOnTheWayWeight ;   //在途吨数
+        BigDecimal sumOnTheWayWeight = BigDecimal.ZERO;   //在途吨数
 
         BigDecimal orderedWeight = BigDecimal.ZERO;     //接单吨数
 
@@ -436,11 +436,15 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             if(child.getStatus() >= OrderChildEnum.Status.UNLOAD.getCode()){
                 unloadTruckNum = unloadTruckNum + 1;
                 sumUnloadWeight = sumUnloadWeight.add(child.getWeight());
-
+            }
+            if(Objects.equals(child.getStatus(), OrderChildEnum.Status.LOAD.getCode()) ||
+                    Objects.equals(child.getStatus(), OrderChildEnum.Status.GO_TO_RECEIVE.getCode()) ||
+                    Objects.equals(child.getStatus(), OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())
+            ){
+                sumOnTheWayWeight = sumOnTheWayWeight.add(child.getLoadNet());
             }
         }
-        //在途吨数 = 矿发量 - 到站量
-        sumOnTheWayWeight = sumLoadWeight.subtract(sumUnloadWeight);
+
 
         //在途车辆数 = 装车车数 - 卸车车数
         onTheWayTruckNum = loadTruckNum - unloadTruckNum;