1.干线同步系统无编码数据bug修复

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

@@ -13310,6 +13310,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		List<TrunklineCarsLoadScanEntity> updateScanList = new ArrayList<>();
 		List<TrunklineAdvanceDetailEntity> incomingAdvanceDetailList = new ArrayList<>();
 		List<TrunklineAdvanceDetailEntity> udateAdvanceDetailList = new ArrayList<>();
+		List<String> orderPackageCodeList = new ArrayList<>();
 		Set<String> orderPackageCodeSet = new HashSet<>();
 
 		carsLoadScanEntities.forEach(carsLoadScanEntity -> {
@@ -13378,6 +13379,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				String reserve5 = trunklineAdvanceDetailEntity.getReserve5();
 				Date unloadTime = CommonUtil.StringToDate(reserve5);
 
+				orderPackageCodeList.add(orderPackageCode);
+
 				//查询是否有在系统无编码后进行卸车的数据
 				int unloadNum = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime);
 				if(unloadNum > 0){
@@ -13470,6 +13473,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			List<String> orderPackageCodes = new ArrayList<>(orderPackageCodeSet);
 
+			orderPackageCodes.removeAll(orderPackageCodeList);
+
 			String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：" + IncomingTypeEnum.getValue(IncomingTypeEnum.SYNC_INCOMING.getCode());
 			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content);