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

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

@@ -13541,6 +13541,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			List<String> scanCodeList = new ArrayList<>(scanCodeSet);
 
+
+			FindParamterDTO findParamterDTO = new FindParamterDTO();
+			findParamterDTO.setOrderPackageCodeList(scanCodeList);
+			findParamterDTO.setWarehouseId(warehouseId);
+			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(findParamterDTO);
+			//把parcelListEntityList转化成以orderPackageCode作为key的Map
+			Map<String, DistributionParcelListEntity> parcelMap = parcelListEntityList.stream()
+				.collect(Collectors.toMap(DistributionParcelListEntity::getOrderPackageCode, Function.identity()));
+
+
 			List<TrunklineAdvanceDetailEntity> allAdvanceDetailList = new ArrayList<>();
 
 			int packageBatchSize = 500;
@@ -13664,11 +13674,15 @@ 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);
+
+						DistributionParcelListEntity parcelList = parcelMap.get(orderPackageCode);
+						if(Objects.isNull(parcelList)){
+							TrunklineAdvanceDetailEntity updateEntity = new TrunklineAdvanceDetailEntity();
+							updateEntity.setId(trunklineAdvanceDetailEntity.getId());
+							updateEntity.setNowWarehouseId(warehouseId);
+							updateEntity.setNowWarehouseName(warehouseName);
+							updateNowWarehouseList.add(updateEntity);
+						}
 					}
 				});