1.bug修复

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

@@ -3044,7 +3044,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 //		Set<String> orderCodes = importOrderNoPackageExcelDTOS.parallelStream().map(ImportOrderNoPackageExcelDTO::getOrderCode).collect(Collectors.toSet());
 
 		//把importOrderNoPackageExcelDTOS的每个元素提取成一个key为orderCode和trainNumber的拼接，value为元素本身的map
-		Map<String, ImportOrderNoPackageExcelDTO> importOrderNoPackageExcelDTOMap = importOrderNoPackageExcelDTOS.parallelStream().collect(Collectors.toMap(a -> a.getOrderCode() + "&" + a.getFirsts(), a -> a));
+		Map<String, ImportOrderNoPackageExcelDTO> importOrderNoPackageExcelDTOMap = importOrderNoPackageExcelDTOS.parallelStream().collect(Collectors.toMap(a -> a.getOrderCode() + "&" + a.getMaterialName(), a -> a));
 
 		importOrderNoPackageExcelDTOMap.remove("null&null");
 
@@ -3092,6 +3092,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 					advanceEntity.setBrand("其他");
 				}
 				advanceEntity.setTotalNum(Integer.parseInt(importOrderNoPackageExcelDTO.getCount()));
+				advanceEntity.setReserve1(importOrderNoPackageExcelDTO.getMaterialName());
 				advanceEntity.setPackName(importOrderNoPackageExcelDTO.getFirsts());
 				advanceEntity.setDealerCode(importOrderNoPackageExcelDTO.getDealerCode());
 				advanceEntity.setDealerName(importOrderNoPackageExcelDTO.getDealerName());
@@ -3123,7 +3124,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		List<TrunklineAdvanceDetailEntity> advanceDetailEntities = new ArrayList<>();
 		for (TrunklineAdvanceEntity advanceEntity : list) {
 			String orderCode = advanceEntity.getOrderCode();
-			String packName = advanceEntity.getPackName();
+			String packName = advanceEntity.getReserve1();
 			ImportOrderNoPackageExcelDTO importOrderNoPackageExcelDTO = importOrderNoPackageExcelDTOMap.get(orderCode + "&" + (StringUtil.isBlank(packName) ? "null" : packName));
 			if(!Objects.isNull(importOrderNoPackageExcelDTO)){
 				String firsts = importOrderNoPackageExcelDTO.getFirsts();
@@ -3205,6 +3206,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		//发送报表基础数据广播
 		//把advanceDetailEntities通过advanceId进行分组
+		try{
 			Map<Long, List<TrunklineAdvanceDetailEntity>> advanceDetailEntityMap = advanceDetailEntities.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId));
 			list.forEach(advanceEntity -> {
 				Long advanceId = advanceEntity.getId();
@@ -3213,6 +3215,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				List<TrunklineAdvanceDetailEntity> advanceDetailEntities1 = advanceDetailEntityMap.get(advanceId);
 				advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,new Date(),advanceDetailEntities1,dealerCode,dealerName);
 			});
+		}catch (Exception e){
+			log.error("############importCustomizedOuPai：发送广播异常");
+		}
 
 
 		return R.success("添加成功");