From 53e4a894749d23532116ad667fd914576331d358 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Sat, 29 Jun 2024 22:48:47 +0800
Subject: [PATCH] =?UTF-8?q?ebom,pbom=20getBomTree=20=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/pojo/vo/BomNewPbomParentVO.java      | 17 +++++++++++++++++
 .../bomnew/service/BomNewEbomParentService.java |  2 +-
 .../bomnew/service/BomNewPbomParentService.java |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
index 7d9d3644..8aee4eff 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
@@ -11,6 +11,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -300,4 +301,20 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable {
     }
 
     private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        BomNewPbomParentVO that = (BomNewPbomParentVO) o;
+        return rowId.equals(that.rowId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), rowId);
+    }
+
+
 }
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 ae27e893..6d1b29f8 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
@@ -578,7 +578,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 bomDetail=Collections.EMPTY_LIST;
             }
         }
-        return  result;
+        return  result.stream().distinct().collect(Collectors.toList());
     }
     private void handlerChildBomVersionDetail(List<BomNewEbomParentVO> bomDetail) {
         List<String> materialNos = bomDetail.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo()) ).map(BomNewEbomParentVO::getMaterialNo).collect(Collectors.toList());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 452018e0..b867db30 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -633,7 +633,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         ForkJoinTask<List<BomNewPbomParentVO>> submit = bomDetailPool.submit(detailTask);
 
         List<BomNewPbomParentVO> result = submit.join();
-        return result;
+        return result.stream().distinct().collect(Collectors.toList());
 
     }