Merge remote-tracking branch 'origin/v22.4_add_sub_weight_repair_20240820' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -187,14 +187,6 @@ public enum PerformanceResultEnum implements ResultEnum {
     UNLOAD_TIME_AFTER_NOW(2107, "交货时间不可晚于当前时间"),
     UNLOAD_TIME_AFTER_FIRST_UNLOAD_TIME(2108, "交货时间不可晚于首次提交时间"),
 
-    SETTLEMENT_NO_NULL_ERROR(2109, "请选择需要下载的数据"),
-
-
-    ORDER_CHILD_RISK_PROCESS_ERROR(2111, "风控已处理"),
-    SETTLEMENT_OWNER_DETAIL_COMPANY_ADD_ERROR(2112, "所选数据存在状态”已处理“的数据，请核实后重新提交"),
-    SETTLEMENT_OWNER_CONFIRM_SETTLEMENT_ERROR(2113, "运单需重新分配开票公司，请联系结算人员处理"),
-
-
     /**
      * 运单装车限制配置
      */
@@ -203,6 +195,15 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_LOAD_LIMIT_CONFIG_DISABLED(2203, "运单装车限制配置禁用"),
     GAODE_DISTANCE_ERROR(2204, "调用高德获取货源地距离失败"),
     TRUCK_LOCATION_ERROR(2205, "获取卡车位置失败"),
+
+    SETTLEMENT_NO_NULL_ERROR(2109, "请选择需要下载的数据"),
+
+
+    ORDER_CHILD_RISK_PROCESS_ERROR(2111, "风控已处理"),
+    SETTLEMENT_OWNER_DETAIL_COMPANY_ADD_ERROR(2112, "所选数据存在状态”已处理“的数据，请核实后重新提交"),
+    SETTLEMENT_OWNER_CONFIRM_SETTLEMENT_ERROR(2113, "运单需重新分配开票公司，请联系结算人员处理"),
+
+
     ;
     private final int code;
     private final String msg;

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

@@ -94,9 +94,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     private final OwnerAccountComponent ownerAccountComponent;
 
+    private final OrderChildOperateRecordDao orderChildOperateRecordDao;
+
     private final OrderChildPoundAuditDao orderChildPoundAuditDao;
 
-    private final OrderChildOperateRecordDao orderChildOperateRecordDao;
 
 
     @Override

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

@@ -145,8 +145,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                             && item.getOrderedWeight().compareTo(BigDecimal.ZERO) != 0){
                         item.setOrderedRate(calcOrderedRate(item.getOrderedWeight(),item.getPendingWeight()));
                     }
-                    if(Objects.nonNull(item.getTaskWeight()) && Objects.nonNull(item.getSumUnloadWeight())){
-
+                    if(Objects.nonNull(item.getTaskWeight()) && item.getTaskWeight().compareTo(BigDecimal.ZERO) >0
+                            && Objects.nonNull(item.getSumUnloadWeight())){
                         //任务完成率 =  到站量 / 任务量
                         BigDecimal taskCompleteRatio =  item.getSumUnloadWeight()
                                 .divide(item.getTaskWeight(),