From 6f43340d1a3edb0ea5cf9e3af0b4efb8c8b2a479 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 18 Dec 2024 17:53:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0feign=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionNodeWorkServiceImpl.java | 2 +- .../impl/TrunklineCarsLoadServiceImpl.java | 10 ++- .../impl/WarehouseTrayTypeServiceImpl.java | 76 ++++++++++--------- 3 files changed, 50 insertions(+), 38 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java index 3d87a0e0c..c4ae8c1dd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java @@ -152,7 +152,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer public void signFor(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { if (nodeFanoutMsg == null) { - log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> nodeFanoutMsg is null！ "); + log.warn(">>>>>>>>>>>>>>>>>>>>>>>>>> nodeFanoutMsg is null！ "); return; } if (distributionProperties.getSendFanoutMsg()) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index d65bd3143..1ee3d6dda 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -9103,12 +9103,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl stockArticleMap = new HashMap<>(); List entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20", waybillNo); //把entityListByOrderCode中所有stockArticleId放入一个Set集合 Set stockArticleIdSet = entityListByOrderCode.stream().map(DistributionParcelListEntity::getStockArticleId).collect(Collectors.toSet()); - List stockArticleEntityList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(stockArticleIdSet)); - //把stockArticleEntityList中所有元素转化成以id为key的Map - Map stockArticleMap = stockArticleEntityList.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getId, e1 -> e1)); + if(!stockArticleIdSet.isEmpty()){ + List stockArticleEntityList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(stockArticleIdSet)); + //把stockArticleEntityList中所有元素转化成以id为key的Map + stockArticleMap = stockArticleEntityList.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getId, e1 -> e1)); + + } int size = entityListByOrderCode.size(); if (planNum.equals(size + realNum)) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index ccbd04f1a..3ad53c5f7 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -4243,25 +4243,29 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderIdSet = warehouseTrayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toSet()); - List stockArticleEntityList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(orderIdSet)); - stockArticleEntityList.forEach(stockArticleEntity -> { - String trays = stockArticleEntity.getTrays(); - if (!StringUtil.isBlank(trays)) { - if (trays.contains(palletName)) { - List list = Arrays.asList(trays.split(trays)); - List trayList = new ArrayList<>(list); - trayList.remove(palletName); - if (CollUtil.isNotEmpty(trayList)) { - DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); - updateStockArticle.setId(stockArticleEntity.getId()); - updateStockArticle.setTrays(StringUtil.join(trayList.toArray(), ",")); - updateStockArticleList.add(updateStockArticle); - } else { - clearStockArticleIdList.add(stockArticleEntity.getId()); + if(CollUtil.isNotEmpty(orderIdSet)){ + List stockArticleEntityList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(orderIdSet)); + stockArticleEntityList.forEach(stockArticleEntity -> { + String trays = stockArticleEntity.getTrays(); + if (!StringUtil.isBlank(trays)) { + if (trays.contains(palletName)) { + List list = Arrays.asList(trays.split(trays)); + List trayList = new ArrayList<>(list); + trayList.remove(palletName); + if (CollUtil.isNotEmpty(trayList)) { + DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); + updateStockArticle.setId(stockArticleEntity.getId()); + updateStockArticle.setTrays(StringUtil.join(trayList.toArray(), ",")); + updateStockArticleList.add(updateStockArticle); + } else { + clearStockArticleIdList.add(stockArticleEntity.getId()); + } } } - } - }); + }); + } + + } else if ("3".equals(associationType)) { //把trayGoodsEntities中的所有元素的associationId放入一个List @@ -4274,25 +4278,29 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl oldParceList = distributionParcelListClient.findListByIds(orderPackageIdList); //把oldParceList中的所有元素的stockArticleId放入一个set Set stockArticleIdSet = oldParceList.stream().map(DistributionParcelListEntity::getStockArticleId).collect(Collectors.toSet()); - List oldStockArticleList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(stockArticleIdSet)); - oldStockArticleList.forEach(stockArticleEntity -> { - String trays = stockArticleEntity.getTrays(); - if (!StringUtil.isBlank(trays)) { - if (trays.contains(palletName)) { - List list = Arrays.asList(trays.split(trays)); - List trayList = new ArrayList<>(list); - trayList.remove(palletName); - if (CollUtil.isNotEmpty(trayList)) { - DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); - updateStockArticle.setId(stockArticleEntity.getId()); - updateStockArticle.setTrays(StringUtil.join(trayList.toArray(), ",")); - updateStockArticleList.add(updateStockArticle); - } else { - clearStockArticleIdList.add(stockArticleEntity.getId()); + if(CollUtil.isNotEmpty(stockArticleIdSet)){ + List oldStockArticleList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(stockArticleIdSet)); + oldStockArticleList.forEach(stockArticleEntity -> { + String trays = stockArticleEntity.getTrays(); + if (!StringUtil.isBlank(trays)) { + if (trays.contains(palletName)) { + List list = Arrays.asList(trays.split(trays)); + List trayList = new ArrayList<>(list); + trayList.remove(palletName); + if (CollUtil.isNotEmpty(trayList)) { + DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); + updateStockArticle.setId(stockArticleEntity.getId()); + updateStockArticle.setTrays(StringUtil.join(trayList.toArray(), ",")); + updateStockArticleList.add(updateStockArticle); + } else { + clearStockArticleIdList.add(stockArticleEntity.getId()); + } } } - } - }); + }); + } + + } });