Merge remote-tracking branch 'origin/v28.8_carrier_exercise_optimization_20241010' into test_jdk17

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

@@ -501,7 +501,9 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
     public Integer calcPendingTruck(List<OrderGoods> orderGoods){
         int totalNeedTruck = 0;
         for (OrderGoods item : orderGoods) {
-            totalNeedTruck = totalNeedTruck + item.getNeedTruckNum();
+            if(!Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+                totalNeedTruck = totalNeedTruck + item.getNeedTruckNum();
+            }
         }
         return totalNeedTruck;
     }