From b701f78062aa23c215282c473e79fd6475eb3657 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 11 Mar 2025 16:08:31 +0800
Subject: [PATCH] 2025-03-11

---
 .../service/impl/QuoteDetailBomServiceImpl.java   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomServiceImpl.java
index c0ac5e0a..2516dfec 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomServiceImpl.java
@@ -75,7 +75,7 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
             Map<Long, List<QuoteDetailBom>> bomMap = bomList.stream().collect(Collectors.groupingBy(QuoteDetailBom::getTreeId));
             // 单个计算
             for (QuoteDetailBomTree tree : trees) {
-                if (Objects.equals(tree.getParentId(),0L)){
+                if (Objects.equals(tree.getParentId(),0L) || !"Purchase".equals(tree.getBomType())){
                     continue;
                 }
                 BigDecimal decimal = nodeTree(trees, bomMap, tree.getId(),detail);
@@ -121,14 +121,11 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
                 }
             }
         }
-        for (QuoteDetailBom bom : bomMap.get(treeId)) {
-//            if (Objects.isNull(bom.getLevelCost())){
-//                bom.setLevelCost(calculateQuotePrice(bom, detail));
-//                if ("Y".equals(bom.getBomFlag())){
-//                    bom.setLevelCost(BigDecimal.ZERO);
-//                }
-//            }
-            price = price.add(bom.getLevelCost());
+        List<QuoteDetailBom> bomList = bomMap.get(treeId);
+        if (Objects.nonNull(bomList)){
+            for (QuoteDetailBom bom : bomList) {
+                price = price.add(bom.getLevelCost());
+            }
         }
         return price;
     }