Merge branch 'dev' into pre-production

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

@@ -739,8 +739,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			throw new CustomerException(2001,"托盘已在其他仓库打托");
 		}
 
+		//只留下包件状态为20的
+		parcelListEntityList = parcelListEntityList.stream().filter(parcelListEntity -> "20".equals(parcelListEntity.getOrderPackageStatus())).collect(Collectors.toList());
+
+
 		//把parcelListEntityList通过orderCode进行分组
-		Map<String, List<DistributionParcelListEntity>> map = parcelListEntityList.stream().filter(parcelListEntity -> "20".equals(parcelListEntity.getOrderPackageStatus())).collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
+		Map<String, List<DistributionParcelListEntity>> map = parcelListEntityList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
 
 		FindParamterDTO findParamterDTO = new FindParamterDTO();
 		findParamterDTO.setOrderCodeSet(map.keySet());
@@ -757,6 +761,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			String orderCode = parcelListEntity.getOrderCode();
 			DistributionStockArticleEntity stockArticleEntity = stockArticleEntityMap.get(orderCode);
 
+			if(!Objects.isNull(stockArticleEntity)){
 				boolean chuanFlag = false;
 				String msg = "";
 				if("10".equals(tt)){//服务号
@@ -841,7 +846,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 					}
 				}
 				orderPackageChuanMap.put(orderPackageCode,chuanFlag?1:0);
-
+			}
 		});
 
 		List<WarehouseTrayGoodsEntity> trayGoodsEntities = new ArrayList<>();