Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -54,7 +54,6 @@ import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.common.annotations.RepeatSubmit;
 import org.springblade.common.constant.*;
-import org.springblade.common.constant.broadcast.FanoutConstants;
 import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant;
 import org.springblade.common.enums.BizOperationEnums;
 import org.springblade.common.exception.CustomerException;
@@ -13681,10 +13680,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					trunklineAdvanceDetailService.updateBatchById(updateNowWarehouseList);
 				}
 
-				if(CollUtil.isNotEmpty(updateScanList)){
-					trunklineCarsLoadScanService.updateBatchById(updateScanList);
-				}
-
 
 
 //			List<DistributionParcelListEntity> updateParceList = new ArrayList<>();
@@ -13716,6 +13711,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			}
 
+			if(CollUtil.isNotEmpty(updateScanList)){
+				trunklineCarsLoadScanService.updateBatchById(updateScanList);
+			}
+
 //		trunklineCarsLoadScanService.updateBatchById(updateScanList);
 
 			//完结所有包件异常列表