From 0e1fd46fd7386feda1eaae507f390090272ec15e Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Fri, 20 Sep 2024 11:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8F=91=E8=B4=A7=E5=8C=85?=
 =?UTF-8?q?=E6=97=B621=E7=BC=96=E7=A0=81=E6=A0=A1=E9=AA=8C=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=8F=8F=E8=BF=B0=E5=B0=B1=E5=A5=BD=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E5=8E=BB=E6=A0=A1=E9=AA=8C=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 8cb8239b..79c2a889 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -2788,14 +2788,23 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .list();
         if (CollUtil.isNotEmpty(children)) {
             //是否有物料名称相同的物料
+            //21编码校验物料描述就好，不用去校验名称  by 10002327 0920
             StringBuilder sb = new StringBuilder();
-            Map<String, List<BomNewEbomChildEntity>> gc = children.stream().collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialName));
+            Map<String, List<BomNewEbomChildEntity>> gc = children.stream().filter(g -> !g.getMaterialNo().startsWith("21")).collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialName));
+            Map<String, List<BomNewEbomChildEntity>> gc21 = children.stream().filter(g -> g.getMaterialNo().startsWith("21")).collect(Collectors.groupingBy(BomNewEbomChildEntity::getMaterialDesc));
             gc.forEach((k, v) -> {
                 if (v.size() > 1) {
                     sb.append(StrUtil.format("{}的物料名称相同。",
                             StrUtil.join(",", v.stream().map(BomNewEbomChildEntity::getMaterialNo).collect(Collectors.toList()))));
                 }
             });
+            gc21.forEach((k, v) -> {
+                if (v.size() > 1) {
+                    sb.append(StrUtil.format("{}的物料描述相同。",
+                            StrUtil.join(",", v.stream().map(BomNewEbomChildEntity::getMaterialNo).collect(Collectors.toList()))));
+                }
+            });
+
             String err = sb.toString();
             VUtils.isTure(StrUtil.isNotBlank(err)).throwMessage("请先处理下面的错误：" + err);