From 4e3bddcfe92e5995f212922d8966de09e03de97a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 15 Aug 2024 14:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionParcelListServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index dce78f797..dd02ac449 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -916,12 +916,12 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl> listMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialName)); listMap.forEach((k,v)->{ //校验品牌 - List brandList = v.stream().map(DistributionParcelListEntity::getBrandName).collect(Collectors.toList()); + List brandList = v.stream().map(DistributionParcelListEntity::getBrandName).distinct().collect(Collectors.toList()); if (brandList.size()>1){ //多个品牌 throw new ServiceException(k+"多个品牌"); } - List mallList = v.stream().map(DistributionParcelListEntity::getMallName).collect(Collectors.toList()); + List mallList = v.stream().map(DistributionParcelListEntity::getMallName).distinct().collect(Collectors.toList()); if (mallList.size()>1){ //多个商场 throw new ServiceException(k+"多个商场"); @@ -931,11 +931,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl materialName = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialName).distinct().collect(Collectors.toList()); + List materialName = v.stream().map(DistributionParcelListEntity::getMaterialName).distinct().collect(Collectors.toList()); if (materialName.size()>1){ throw new ServiceException(k+"存在多个物料单位"); } - List materialUnit = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialUnit).distinct().collect(Collectors.toList()); + List materialUnit = v.stream().map(DistributionParcelListEntity::getMaterialUnit).distinct().collect(Collectors.toList()); if (materialUnit.size()>1){ //多个物料单位 throw new ServiceException(k+"存在多个物料单位");