From 27148b38938920185433b0a1ce567532bbc22823 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 9 Apr 2025 11:17:15 +0800
Subject: [PATCH] 2025-04-09

---
 .../modules/quote/mapper/QuoteDetailBomTreeMapper.java |  3 +++
 .../service/impl/QuoteDetailBomTreeServiceImpl.java    |  6 ++++++
 .../mapper/quote/QuoteDetailBomTreeMapper.xml          | 10 ++++++++++
 3 files changed, 19 insertions(+)

diff --git a/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java b/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java
index 90767fe8..ff273458 100644
--- a/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java
+++ b/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java
@@ -1,6 +1,7 @@
 package com.spring.modules.quote.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.spring.modules.part.entity.PartInformationEntity;
 import com.spring.modules.quote.entity.QuoteDetail;
 import com.spring.modules.quote.entity.QuoteDetailBom;
 import com.spring.modules.quote.entity.QuoteDetailBomTree;
@@ -26,4 +27,6 @@ public interface QuoteDetailBomTreeMapper extends BaseMapper<QuoteDetailBomTree>
     QuoteDetailRouting queryPartBomRouting(QuoteDetail detail);
 
     BigDecimal getPartCost(@Param("site") String site,@Param("partNo") String partNo);
+
+    PartInformationEntity queryPart(@Param("site") String site,@Param("partNo") String partNo);
 }
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 e706fc87..4dfa3e54 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
@@ -53,6 +53,12 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
         // 1、通过PartNo、Site和BuNo 查询BOM信息 失效日期日期为空 替代为* 和Routing (存在BOM的物料)
         if (parentId.equals(0L)){
             detail.setBomType("Manufacturing");
+        }else {
+            // 最上级已经是正式料号,需要判断其他是否是正式料号
+            PartInformationEntity part = baseMapper.queryPart(detail.getSite(),detail.getPartNo());
+            if (Objects.nonNull(part) && "Y".equals(part.getStatus())){
+                detail.setPartNo(part.getPartNo());
+            }
         }
         QuoteDetailBomTree bom =  baseMapper.queryPartBom(detail);
         if (Objects.isNull(bom)){
diff --git a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
index 88826fe3..2b2a7ca1 100644
--- a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
@@ -178,4 +178,14 @@
     <select id="getPartCost" resultType="java.math.BigDecimal">
         select isnull(dbo.get_part_unitCost(#{site}, #{partNo}),0)
     </select>
+
+    <select id="queryPart" resultType="com.spring.modules.part.entity.PartInformationEntity">
+        select top 1 site,
+        part_no,
+        status,
+        ifs_part_no
+        from part p
+        where p.site = #{site}
+        and p.plm_part_no = #{partNo}
+    </select>
 </mapper>