From 795b30fe3a4a69c6b9fe70107f3780bf08efbf93 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 25 Oct 2024 13:17:17 +0800 Subject: [PATCH] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OpenOrderServiceImpl.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 407aa47d1..36294174f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -3044,7 +3044,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { // Set orderCodes = importOrderNoPackageExcelDTOS.parallelStream().map(ImportOrderNoPackageExcelDTO::getOrderCode).collect(Collectors.toSet()); //把importOrderNoPackageExcelDTOS的每个元素提取成一个key为orderCode和trainNumber的拼接，value为元素本身的map - Map importOrderNoPackageExcelDTOMap = importOrderNoPackageExcelDTOS.parallelStream().collect(Collectors.toMap(a -> a.getOrderCode() + "&" + a.getFirsts(), a -> a)); + Map 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 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,14 +3206,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //发送报表基础数据广播 //把advanceDetailEntities通过advanceId进行分组 - Map> advanceDetailEntityMap = advanceDetailEntities.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId)); - list.forEach(advanceEntity -> { - Long advanceId = advanceEntity.getId(); - String dealerCode = advanceEntity.getDealerCode(); - String dealerName = advanceEntity.getDealerName(); - List advanceDetailEntities1 = advanceDetailEntityMap.get(advanceId); - advanceDetailService.sendReportBasicdataFanout(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,new Date(),advanceDetailEntities1,dealerCode,dealerName); - }); + try{ + Map> advanceDetailEntityMap = advanceDetailEntities.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId)); + list.forEach(advanceEntity -> { + Long advanceId = advanceEntity.getId(); + String dealerCode = advanceEntity.getDealerCode(); + String dealerName = advanceEntity.getDealerName(); + List 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("添加成功");