From 2bdeba22bc2b1cbb70f317cecaec2fd15420e547 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Thu, 11 Jan 2024 22:21:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/domain/EBom/CheckEBomException.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
index ffdd9c73..e482286c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
@@ -153,7 +153,7 @@ public class CheckEBomException {
 //                });
 //            }
             //是否存在重复物料
-            List<BomNewEbomParentVO> hasMaterialNoList = child.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList());
+            List<BomNewEbomParentVO> hasMaterialNoList = child.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).collect(Collectors.toList());
             Map<String, List<BomNewEbomParentVO>> childMaterialMap = ListCommonUtil.listGroupMap(hasMaterialNoList, BomNewEbomParentVO::getMaterialNo);
             for (String key : childMaterialMap.keySet()) {
                 List<BomNewEbomParentVO> materialGroupList = childMaterialMap.get(key);

From 7b05c2a126c70230a9f0967b09791618fca406c0 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Thu, 11 Jan 2024 22:30:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/service/BomNewEbomParentService.java | 1 +
 1 file changed, 1 insertion(+)

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 7e1436eb..66fc5ff8 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
@@ -117,6 +117,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             }
             if (StrUtil.isNotBlank(materialNo)) {
                 List<String> parentMaterialByMaterialNo = getParentMaterialByMaterialNo(materialNo, !userRoleService.technician()).stream().collect(Collectors.toList());
+                parentMaterialByMaterialNo.add(materialNo);
                 if (CollUtil.isNotEmpty(parentMaterialByMaterialNo)) {
                     List<BomNewEbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(parentMaterialByMaterialNo);
                     List<BomNewEbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(parentMaterialByMaterialNo, materialNo);