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

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

@@ -13350,6 +13350,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			advanceService.saveOrderAndPackages(udateAdvanceDetailList, warehouseId);
 
+			List<TrunklineAdvanceDetailEntity> updateNowWarehouseList = new ArrayList<>();
 			List<DistributionParcelListEntity> updateParceList = new ArrayList<>();
 			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
 
@@ -13381,9 +13382,21 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							updateParceList.add(updateEntity);
 						});
 					}
+					TrunklineAdvanceDetailEntity updateEntity = new TrunklineAdvanceDetailEntity();
+					updateEntity.setId(trunklineAdvanceDetailEntity.getId());
+					updateEntity.setNowWarehouseId(warehouseId);
+					updateEntity.setNowWarehouseName(warehouseName);
+					updateNowWarehouseList.add(updateEntity);
 				}
 			});
-			distributionParcelListClient.updateList(updateParceList);
+
+			if(CollUtil.isNotEmpty(updateParceList)){
+				distributionParcelListClient.updateList(updateParceList);
+			}
+
+			if(CollUtil.isNotEmpty(updateNowWarehouseList)){
+				trunklineAdvanceDetailService.updateBatchById(updateNowWarehouseList);
+			}
 
 
 
@@ -13409,19 +13422,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 
 
-			List<TrunklineAdvanceDetailEntity> updateNowWarehouseList = new ArrayList<>();
+
 			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
-				TrunklineAdvanceDetailEntity updateEntity = new TrunklineAdvanceDetailEntity();
-				updateEntity.setId(trunklineAdvanceDetailEntity.getId());
-				updateEntity.setNowWarehouseId(warehouseId);
-				updateEntity.setNowWarehouseName(warehouseName);
-				updateNowWarehouseList.add(updateEntity);
+
 			});
 
-			trunklineAdvanceDetailService.updateBatchById(updateNowWarehouseList);
+
 		}
 
-		trunklineCarsLoadScanService.updateBatchById(updateScanList);
+//		trunklineCarsLoadScanService.updateBatchById(updateScanList);
 
 		int i= 0;