Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test

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

@@ -4,10 +4,7 @@ import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.ResultEnum;
-import com.clx.performance.enums.TruckDemandEnum;
+import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -147,6 +144,9 @@ public class OrderWeightServiceImpl implements OrderWeightService {
         BigDecimal alreadyWeight = BigDecimal.ZERO;    //该订单下已经拉运的重量
 
         for (OrderChild child : orderChildList) {
+            if(child.getStatus() > OrderChildEnum.Status.COMPLETE.getCode()){
+                continue;
+            }
             if(Objects.nonNull(child.getLoadNet())){
                 alreadyWeight = alreadyWeight.add(child.getLoadNet());
             }else{