Merge remote-tracking branch 'origin/v26.2-jdk17springboot3-20240912' into test_jdk17

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

@@ -500,19 +500,21 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
     //统计挂单车数
     public Integer calcPendingTruck(List<OrderGoods> orderGoods){
         int totalNeedTruck = 0;
-        List<String> cancelOrderGoodsNo = new ArrayList<>();
+        List<String> completedOrderGoodsNo = new ArrayList<>();
         for (OrderGoods item : orderGoods) {
-            if(Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){
-                cancelOrderGoodsNo.add(item.getOrderGoodsNo());
+            if(!Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+                if(Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.COMPLETED.getCode())){
+                    completedOrderGoodsNo.add(item.getOrderGoodsNo());
                 }else{
                     totalNeedTruck = totalNeedTruck + item.getNeedTruckNum();
                 }
+
+            }
         }
-        if(CollectionUtils.isNotEmpty(cancelOrderGoodsNo)){
-            Long count = orderChildDao.countNotCancelOrderChild(cancelOrderGoodsNo);
+        if(CollectionUtils.isNotEmpty(completedOrderGoodsNo)){
+            Long count = orderChildDao.countNotCancelOrderChild(completedOrderGoodsNo);
             totalNeedTruck = totalNeedTruck + count.intValue();
         }
-
         return totalNeedTruck;
     }