Merge remote-tracking branch 'origin/v23.7_export_performance_progress_20240829'…

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

@@ -31,6 +31,7 @@ import com.clx.performance.model.PerformanceProgress;
 import com.clx.performance.model.PerformanceProgressLog;
 import com.clx.performance.param.pc.carrier.PagePerformanceProgress;
 import com.clx.performance.param.pc.carrier.UpdatePerformanceProgressParam;
+import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.PerformanceProgressLogService;
 import com.clx.performance.service.PerformanceProgressService;
 import com.clx.performance.struct.PerformanceProgressLogStruct;
@@ -85,7 +86,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
     private final OrderService orderService;
     private final ThirdAppConfig thirdAppConfig;
     private final OrderFeign orderFeign;
-
+    private final OrderGoodsService orderGoodsService;
     public static List<Integer> inProcessStatusList;
     public static List<Integer> endStatusList ;
     public static List<Integer> allStatusList ;
@@ -451,7 +452,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             //最后一个挂单中的货单的挂单时间为最早的挂单时间
             firstPendingTime = item.getPendingOrderTime();
 
-            pendingWeight = pendingWeight.add(item.getExtractWeight());
+            pendingWeight = pendingWeight.add(orderGoodsService.calcOrderGoodsResidueWeight(item.getExtractWeight(),
+                    item.getAlreadyTransportWeight()));
         }
         PerformanceProgress update = new PerformanceProgress();
         update.setId(optional.get().getId());