From 6067fcae2bd99a6aee224cdfcacf0c68e07a91b8 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 20 Dec 2025 15:59:41 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-20=20=E6=8A=A5=E4=BB=B7=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84estimatedMaterialCost=E4=BB=8E=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quote/mapper/QuoteDetailBomTreeMapper.java   |  8 ++++++++
 .../quote/service/QuoteDetailBomTreeService.java |  3 +--
 .../impl/QuoteDetailBomTreeServiceImpl.java      | 16 +++++++++++-----
 .../service/impl/QuoteDetailServiceImpl.java     |  2 +-
 .../mapper/quote/QuoteDetailBomTreeMapper.xml    |  8 ++++++++
 5 files changed, 29 insertions(+), 8 deletions(-)

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 26345cbf..40d39aa8 100644
--- a/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java
+++ b/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java
@@ -47,4 +47,12 @@ public interface QuoteDetailBomTreeMapper extends BaseMapper<QuoteDetailBomTree>
      * @return 预估材料成本（estimated_material_cost）
      */
     BigDecimal queryEstimatedMaterialCost(@Param("site") String site, @Param("partNo") String partNo);
+    
+    /**
+     * 根据物料编码查询物料状态
+     * @param site 站点
+     * @param partNo 物料编码
+     * @return 物料状态（Y=正式物料, N=非正式物料）
+     */
+    String queryPartStatus(@Param("site") String site, @Param("partNo") String partNo);
 }
diff --git a/src/main/java/com/spring/modules/quote/service/QuoteDetailBomTreeService.java b/src/main/java/com/spring/modules/quote/service/QuoteDetailBomTreeService.java
index eb3656d0..76981fcf 100644
--- a/src/main/java/com/spring/modules/quote/service/QuoteDetailBomTreeService.java
+++ b/src/main/java/com/spring/modules/quote/service/QuoteDetailBomTreeService.java
@@ -33,8 +33,7 @@ public interface QuoteDetailBomTreeService extends IService<QuoteDetailBomTree>
      * 根据物料编码查询预估材料成本
      * @param site 站点
      * @param partNo 物料编码
-     * @param status 物料状态 (Y=正式物料调用IFS接口, N=非正式物料查询数据库)
      * @return 预估材料成本（estimated_material_cost）
      */
-    BigDecimal queryEstimatedMaterialCost(String site, String partNo, String status);
+    BigDecimal queryEstimatedMaterialCost(String site, 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 593d1bc6..96ba7bca 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
@@ -497,14 +497,18 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
     }
     
     @Override
-    public BigDecimal queryEstimatedMaterialCost(String site, String partNo, String status) {
-        log.info("queryEstimatedMaterialCost - Request params: site={}, partNo={}, status={}", site, partNo, status);
+    public BigDecimal queryEstimatedMaterialCost(String site, String partNo) {
+        log.info("queryEstimatedMaterialCost - Request params: site={}, partNo={}", site, partNo);
         
-        // 非正式物料(status='N')直接从数据库查询
+        // 从part表查询物料状态
+        String status = baseMapper.queryPartStatus(site, partNo);
+        log.info("queryEstimatedMaterialCost - Query part status from database: status={}", status);
+        
+        // 非正式物料(status='N'或为空)直接从数据库查询
         if (!"Y".equals(status)) {
             BigDecimal cost = baseMapper.queryEstimatedMaterialCost(site, partNo);
             BigDecimal result = cost != null ? cost : BigDecimal.ZERO;
-            log.info("queryEstimatedMaterialCost - Unofficial part, query from database. Result: {}", result);
+            log.info("queryEstimatedMaterialCost - Unofficial part (status={}), query from database. Result: {}", status, result);
             return result;
         }
         
@@ -534,7 +538,9 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
             
             if (Objects.equals(map.get("resultCode"), "200")) {
                 InventoryPartUnitCostSumVo unitCostSumVo = JSONObject.parseObject(map.get("obj"), InventoryPartUnitCostSumVo.class);
-                BigDecimal estimatedCost = new BigDecimal(unitCostSumVo.getInventoryValue());
+                String estimatedMaterialCostStr = unitCostSumVo.getEstimatedMaterialCost();
+                BigDecimal estimatedCost = org.apache.commons.lang3.StringUtils.isNotBlank(estimatedMaterialCostStr) 
+                        ? new BigDecimal(estimatedMaterialCostStr) : BigDecimal.ZERO;
                 log.info("queryEstimatedMaterialCost - Successfully retrieved estimated material cost from IFS: {}", estimatedCost);
                 return estimatedCost;
             } else {
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 ace0a1b2..f10e2745 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
@@ -271,7 +271,7 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                 // 如果半成品的BOM类型是Purchase，则加上该物料的预估材料成本(estimated_material_cost)
                 if ("Purchase".equals(bomTree.getBomType())) {
                     BigDecimal estimatedMaterialCost = quoteDetailBomTreeService.queryEstimatedMaterialCost(
-                            bomTree.getSite(), bomTree.getPartNo(), bomTree.getStatus());
+                            bomTree.getSite(), bomTree.getPartNo());
                     bomQuotePrice = bomQuotePrice.add(estimatedMaterialCost);
                     log.info("Semi-finished product {} is Purchase type, add estimated material cost {}, accumulated cost is {}", 
                             bomTree.getPartNo(), estimatedMaterialCost, bomQuotePrice);
diff --git a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
index 366a40f6..e9567e63 100644
--- a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
@@ -207,6 +207,14 @@
         where site = #{site}
         and part_no = #{partNo}
     </select>
+    
+    <!-- 根据物料编码查询物料状态 -->
+    <select id="queryPartStatus" resultType="java.lang.String">
+        select status
+        from part
+        where site = #{site}
+        and part_no = #{partNo}
+    </select>
 
     <select id="queryPLMPart" resultType="com.spring.modules.part.entity.PartInformationEntity">
         select top 1 site,