From 2112e9f64822ce8c18fa085b2cacc11a3a9bc6bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 6 Jan 2024 17:05:18 +0800
Subject: [PATCH] =?UTF-8?q?EBOM-=E7=89=A9=E6=96=99=E5=92=8C=E5=9B=BE?=
 =?UTF-8?q?=E5=8F=B7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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 6676fdf4..b28e2119 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
@@ -115,7 +115,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 }
             }
             if (StrUtil.isNotBlank(materialNo)) {
-                List<String> parentMaterialByMaterialNo = getParentMaterialByMaterialNo(materialNo, !userRoleService.technician());
+                List<String> parentMaterialByMaterialNo = getParentMaterialByMaterialNo(materialNo, !userRoleService.technician()).stream().collect(Collectors.toList());
                 if (CollUtil.isNotEmpty(parentMaterialByMaterialNo)) {
                     List<BomNewEbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(parentMaterialByMaterialNo);
                     List<BomNewEbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(parentMaterialByMaterialNo, materialNo);
@@ -132,7 +132,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             returnResult = result;
         }
         //动态判断异常
-        CheckEBomExceptoinDynamic.check(returnResult.getRecords());
+       // CheckEBomExceptoinDynamic.check(returnResult.getRecords());
         return returnResult;
     }
 
@@ -147,12 +147,15 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         resutlData.setPages(1);
         resutlData.setCurrent(1L);
         List<BomNewEbomParentVO> all = new ArrayList<>();
-        all.addAll(resultParents);
+       // all.addAll(resultParents);
         all.addAll(childs);
         List<BomNewEbomParentVO> result = new ArrayList<>();
         for (BomNewEbomParentVO vo : resultParents) {
-            vo.setParentRowId(0L);
-            result.addAll(CTreeUtils.toTree(0L, all, BomNewEbomParentVO::getParentRowId, BomNewEbomParentVO::getBomRowId));
+            //vo.setParentRowId(0L);
+            List<BomNewEbomParentVO> da=new ArrayList<>();
+            da.addAll(childs);
+            da.add(vo);
+            result.addAll(CTreeUtils.toTree(0L, da, BomNewEbomParentVO::getParentRowId, BomNewEbomParentVO::getBomRowId));
         }
         resutlData.setRecords(result);
         return resutlData;
@@ -165,9 +168,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      * @param materialNo
      * @return
      */
-    public List<String> getParentMaterialByMaterialNo(String materialNo, Boolean selfIs) {
+    public Set<String> getParentMaterialByMaterialNo(String materialNo, Boolean selfIs) {
         BomNewEbomMaterialUseEntity materialBom = bomNewEbomMaterialUseService.lambdaQuery().eq(BomNewEbomMaterialUseEntity::getMaterialNo, materialNo).one();
-        List<String> result = new ArrayList<>();
+        Set<String> result = new HashSet<>();
         if (Objects.nonNull(materialBom) && StrUtil.isNotBlank(materialBom.getParentMaterialNo())) {
             Set<String> relSkuNo = Sets.newHashSet(StrUtil.split(materialBom.getParentMaterialNo(), ","));
             if (selfIs && CollUtil.isNotEmpty(relSkuNo)) {