Merge remote-tracking branch 'origin/v22.2_sync_station_info_20240819' into test

performance-web/src/main/java/com/clx/performance/job/PushOrderChildExpectTimeJob.java

@@ -104,7 +104,11 @@ public class PushOrderChildExpectTimeJob {
                     }
                     if(Objects.equals(orderSourceMap.get(item.getOrderNo()),SyncPlatformEnum.Source.TRADE_PLATFORM.getCode())){
                         syncSmbExpectList.add(dto);
-                    }else{
+                        //集煤宝的运单预计时间也要同步给马上来供应链，马上来供应链同步给场站
+                        syncNewOwnerClientExpectList.add(dto);
+
+                    }
+                    if(Objects.equals(orderSourceMap.get(item.getOrderNo()),SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode())){
                         syncNewOwnerClientExpectList.add(dto);
                     }
                 }

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

@@ -1827,7 +1827,8 @@ public class OrderChildServiceImpl implements OrderChildService {
      * @return
      */
     private SuperviseInfo getSuperviseInfo(String orderNo, int type) {
-        App app = appConfig.getApp(AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode());//对接马上来供应链配置信息//对接马上来供应链配置信息
+        App app = appConfig.getApp(AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode());//对接马上来供应链配置信息
+
         //组装配置信息
         RequestConfig config = new RequestConfig()
                 .setAppId(app.getAppNo())

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

@@ -452,8 +452,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             //最后一个挂单中的货单的挂单时间为最早的挂单时间
             firstPendingTime = item.getPendingOrderTime();
 
-            pendingWeight = pendingWeight.add(orderGoodsService.calcOrderGoodsResidueWeight(item.getExtractWeight(),
-                    item.getAlreadyTransportWeight()));
+            pendingWeight = pendingWeight.add(item.getExtractWeight());
+
         }
         PerformanceProgress update = new PerformanceProgress();
         update.setId(optional.get().getId());