From e285d6f3c4ef3ec689dea95a53011d0d573e1213 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 12 Mar 2025 14:30:00 +0800
Subject: [PATCH] 2025-03-12

---
 .../quote/service/impl/QuoteDetailBomTreeServiceImpl.java      | 3 +--
 .../modules/quote/service/impl/QuoteDetailServiceImpl.java     | 1 +
 src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
index e1118d42..d3fed415 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
@@ -100,8 +100,6 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
             purchase.setComponentScrap(BigDecimal.ZERO);
             purchase.setIssueType("");
             purchase.setShrinkageFactor(BigDecimal.ZERO);
-            purchase.setCreateBy(detail.getCreateBy());
-            purchase.setCreateDate(detail.getCreateDate());
             BigDecimal price = baseMapper.getPartCost(purchase.getSite(),purchase.getPartNo());
             purchase.setUnitPrice(price);
             purchase.setActualPrice(price);
@@ -249,6 +247,7 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
             detail.setPartNo(tree.getPartNo());
             detail.setSite(tree.getSite());
             detail.setBuNo(tree.getBuNo());
+            detail.setBomType(tree.getBomType());
             detail.setEngChgLevel(tree.getEngChgLevel());
             detail.setAlternativeNo(tree.getAlternativeNo());
             initQuoteDetailBomTree(detail, bomTree.getParentId(), Optional.ofNullable(tree.getLevel()).orElse(0));
diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
index ada019be..62ee4ffb 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
@@ -288,6 +288,7 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                                 .eq(QuoteDetailBom::getId,bom.getId())
                                 .update();
                     }
+
                     BigDecimal qtyPerAssembly = BigDecimal.ONE;
                     for (QuoteDetailBom bom : parentBomList) {
                         BigDecimal yield = BigDecimal.ONE.subtract(bom.getShrinkageFactor().divide( BigDecimal.valueOf(100),16,RoundingMode.HALF_UP));
diff --git a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
index 39842825..b918cd82 100644
--- a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
@@ -60,7 +60,7 @@
         <if test="alternativeNo  == null or alternativeNo  == ''">
             and bd.alternative_no = '*'
         </if>
-        <if test="bomType  != null and bomType  == ''">
+        <if test="bomType != null and bomType != ''">
             and bd.bom_type = #{bomType}
         </if>
         order by bh.eff_phase_in_date desc,bh.create_date desc