From 96b4635fbca8dd5e8261701e9ef0c63c30998e96 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 7 Mar 2025 17:10:42 +0800
Subject: [PATCH] 2025-03-07

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

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 8d987d6b..280c965f 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
@@ -248,13 +248,13 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                 log.info("当前BOM：{}", bomTree.getPartNo());
                 // 第二层BOM 目的是遍历所有的 BOM中 的 Part用量
                 long parentId = bomTree.getParentId();
+                String partNo = bomTree.getPartNo();
                 for (QuoteDetailBomTree tree : list) {
                     if (tree.getLevel() > bomTree.getLevel() || tree.getId() != parentId) {
                         continue;
                     }
-                    parentId = tree.getParentId();
                     // 获取 层级比自己高的Bom 来获得BOM信息 用量和损耗
-                    List<QuoteDetailBom> bomList = quoteDetailBomService.lambdaQuery().eq(QuoteDetailBom::getTreeId, tree.getParentId()).eq(QuoteDetailBom::getComponentPart, tree.getPartNo()).list();
+                    List<QuoteDetailBom> bomList = quoteDetailBomService.lambdaQuery().eq(QuoteDetailBom::getTreeId, parentId).eq(QuoteDetailBom::getComponentPart, partNo).list();
                     BigDecimal qtyPerAssembly = BigDecimal.ONE;
                     for (QuoteDetailBom bom : bomList) {
                         BigDecimal yield = BigDecimal.ONE.subtract(bom.getShrinkageFactor().divide( BigDecimal.valueOf(100),16,RoundingMode.HALF_UP));
@@ -264,6 +264,9 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                     // 计算 损耗和用量得到的差异
                     bomLabourCost = bomLabourCost.multiply(qtyPerAssembly);
                     bomMachineCost = bomMachineCost.multiply(qtyPerAssembly);
+                    // 拿到上层数据
+                    parentId = tree.getParentId();
+                    partNo = tree.getPartNo();
                 }
                 labourCost = labourCost.add(bomLabourCost);
                 machineCost = machineCost.add(bomMachineCost);
diff --git a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
index bde4235b..8af5ed55 100644
--- a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
@@ -41,8 +41,7 @@
         #{versionNo} as version_no
         from plm_bom_detail bd
         left join plm_bom_header bh
-        on bd.site = bh.site and bd.part_no = bh.part_no
-        and bd.bom_type = bh.bom_type and bd.eng_chg_level = bh.eng_chg_level
+        on bd.site = bh.site and bd.part_no = bh.part_no and bd.bom_type = bh.bom_type and bd.eng_chg_level = bh.eng_chg_level
         where bd.site = #{site}
         and bd.part_no = #{partNo}
 <!--        and bd.status != 'Tentative'-->
diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
index 0d4599f1..39a62b5b 100644
--- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
@@ -105,7 +105,7 @@
                 and qd.quote_group_detail_id = #{quoteGroupDetailId}
             </if>
         </where>
-        order by qd.id desc
+        order by qd.id
     </select>
 
     <select id="queryQuoteDetailByPage" resultType="com.spring.modules.quote.entity.QuoteDetail">