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

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

@@ -13297,6 +13297,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			allAdvanceDetailList.addAll(advanceDetailEntityList);
 		});
 
+		//把allAdvanceDetailList中所有advanceId放入一个Set集合
+		Set<Long> advanceIdSet = allAdvanceDetailList.stream().map(TrunklineAdvanceDetailEntity::getAdvanceId).collect(Collectors.toSet());
+		List<TrunklineAdvanceEntity> advanceEntities = advanceService.findListByIds(new ArrayList<>(advanceIdSet));
+		//把advanceEntities转化成id为key的Map
+		Map<Long, TrunklineAdvanceEntity> advanceMap = advanceEntities.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getId, Function.identity()));
+
+
 		//把allAdvanceDetailList转化成orderPackageCode为key的Map
 		Map<String, TrunklineAdvanceDetailEntity> advanceDetailMap = allAdvanceDetailList.stream().collect(Collectors.toMap(TrunklineAdvanceDetailEntity::getOrderPackageCode, Function.identity()));
 
@@ -13310,6 +13317,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			Date unloadTime = carsLoadScanEntity.getUnloadTime();
 			TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = advanceDetailMap.get(orderPackageCode);
 			if(!Objects.isNull(trunklineAdvanceDetailEntity)){
+				Long advanceId = trunklineAdvanceDetailEntity.getAdvanceId();
+
 				orderPackageCodeSet.add(orderPackageCode);
 				TrunklineCarsLoadScanEntity updateScanEntity = new TrunklineCarsLoadScanEntity();
 				updateScanEntity.setId(carsLoadScanEntity.getId());
@@ -13327,6 +13336,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				updateScanEntity.setOrderCode(trunklineAdvanceDetailEntity.getOrderCode());
 				updateScanEntity.setWaybillId(trunklineAdvanceDetailEntity.getWaybillId());
 				updateScanEntity.setWaybillNo(trunklineAdvanceDetailEntity.getWaybillNo());
+				TrunklineAdvanceEntity advanceEntity = advanceMap.get(advanceId);
+				if(!Objects.isNull(advanceEntity)){
+					updateScanEntity.setCustomerName(advanceEntity.getCustomerName());
+					updateScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+					updateScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+				}
+				updateScanEntity.setFirsts(trunklineAdvanceDetailEntity.getFirstPackName());
+				updateScanEntity.setSenconds(trunklineAdvanceDetailEntity.getSecondPackName());
+				updateScanEntity.setThirds(trunklineAdvanceDetailEntity.getThirdPackName());
+				updateScanEntity.setMaterialCode(trunklineAdvanceDetailEntity.getMaterialCode());
+				updateScanEntity.setMaterialName(trunklineAdvanceDetailEntity.getMaterialName());
 				updateScanEntity.setIsData(1);
 				updateScanList.add(updateScanEntity);
 			}
@@ -13426,9 +13446,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 
 
-			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
-
-			});
+//			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
+//
+//			});
 
 
 		}
@@ -13447,6 +13467,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			dealWithAbnormalVO.setNickName(AuthUtil.getNickName());
 			dealWithAbnormalVO.setRemark("数据同步系统自动处理（"+warehouseName+" "+carsLoadEntity.getCarsNo()+" "+AuthUtil.getNickName()+"）");
 			abnormalRecordClient.dealwithOrderPackageCodes(dealWithAbnormalVO);
+
+			List<String> orderPackageCodes = new ArrayList<>(orderPackageCodeSet);
+
+			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);
+
 		}
 
 		bladeRedis.del(key);