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

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -17,6 +17,7 @@ import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.child.OrderChildPostService;
+import com.clx.performance.utils.spring.ApplicationContextUtils;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.base.Optional;
 import com.msl.common.utils.DateUtils;
@@ -64,7 +65,6 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     private final OrderChildPostService orderChildPostService;
 
-    private final OrderGoodsService orderGoodsService;
 
 
     //根据货单最晚接单时间处理
@@ -123,8 +123,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     continue;
                 }
                 OrderGoods orderGoods = optional.get();
-                BigDecimal residueTransportWeight = orderGoodsService.calcOrderGoodsResidueWeight
-                        (orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());
+                BigDecimal residueTransportWeight = ApplicationContextUtils.getBean(OrderGoodsService.class).
+                        calcOrderGoodsResidueWeight(orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());;
 
                 if (residueTransportWeight.compareTo(BigDecimal.ZERO) == 0) {
                     List<OrderChild> orderChildren = orderChildDao.selectInTransitOrderChildByOrderGoodsNo(orderGoodsNo);