1.增加feign调用判断

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<DistributionSignforVO> nodeFanoutMsg, BladeUser user) {
 		try {
 			if (nodeFanoutMsg == null) {
-				log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> nodeFanoutMsg is null！ ");
+				log.warn(">>>>>>>>>>>>>>>>>>>>>>>>>> nodeFanoutMsg is null！ ");
 				return;
 			}
 			if (distributionProperties.getSendFanoutMsg()) {

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

@@ -9103,12 +9103,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			if (Objects.nonNull(finalNodeWarehouse)) {
 				finalNodeName = finalNodeWarehouse.getName();
 			}
+			Map<Long, DistributionStockArticleEntity> stockArticleMap = new HashMap<>();
 			List<DistributionParcelListEntity> entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20", waybillNo);
 			//把entityListByOrderCode中所有stockArticleId放入一个Set集合
 			Set<Long> stockArticleIdSet = entityListByOrderCode.stream().map(DistributionParcelListEntity::getStockArticleId).collect(Collectors.toSet());
-			List<DistributionStockArticleEntity> stockArticleEntityList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(stockArticleIdSet));
-			//把stockArticleEntityList中所有元素转化成以id为key的Map
-			Map<Long, DistributionStockArticleEntity> stockArticleMap = stockArticleEntityList.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getId, e1 -> e1));
+			if(!stockArticleIdSet.isEmpty()){
+				List<DistributionStockArticleEntity> 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)) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -4243,25 +4243,29 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			if ("1".equals(associationType)) {
 				//把warehouseTrayGoodsEntities中所有的associationId放入一个Set
 				Set<Long> orderIdSet = warehouseTrayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toSet());
-				List<DistributionStockArticleEntity> stockArticleEntityList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(orderIdSet));
-				stockArticleEntityList.forEach(stockArticleEntity -> {
-					String trays = stockArticleEntity.getTrays();
-					if (!StringUtil.isBlank(trays)) {
-						if (trays.contains(palletName)) {
-							List<String> list = Arrays.asList(trays.split(trays));
-							List<String> 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<DistributionStockArticleEntity> stockArticleEntityList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(orderIdSet));
+					stockArticleEntityList.forEach(stockArticleEntity -> {
+						String trays = stockArticleEntity.getTrays();
+						if (!StringUtil.isBlank(trays)) {
+							if (trays.contains(palletName)) {
+								List<String> list = Arrays.asList(trays.split(trays));
+								List<String> 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<WarehouseTrayT
 				List<DistributionParcelListEntity> oldParceList = distributionParcelListClient.findListByIds(orderPackageIdList);
 				//把oldParceList中的所有元素的stockArticleId放入一个set
 				Set<Long> stockArticleIdSet = oldParceList.stream().map(DistributionParcelListEntity::getStockArticleId).collect(Collectors.toSet());
-				List<DistributionStockArticleEntity> oldStockArticleList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(stockArticleIdSet));
-				oldStockArticleList.forEach(stockArticleEntity -> {
-					String trays = stockArticleEntity.getTrays();
-					if (!StringUtil.isBlank(trays)) {
-						if (trays.contains(palletName)) {
-							List<String> list = Arrays.asList(trays.split(trays));
-							List<String> 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<DistributionStockArticleEntity> oldStockArticleList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(stockArticleIdSet));
+					oldStockArticleList.forEach(stockArticleEntity -> {
+						String trays = stockArticleEntity.getTrays();
+						if (!StringUtil.isBlank(trays)) {
+							if (trays.contains(palletName)) {
+								List<String> list = Arrays.asList(trays.split(trays));
+								List<String> 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());
+								}
 							}
 						}
-					}
-				});
+					});
+				}
+
+
 			}
 		});