From 4a53b0d4aa8abca491d9e730e9735aefc133d91e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 17 Mar 2026 13:15:41 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-17=20=E9=94=80=E5=94=AE=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E7=9A=84=E2=80=9C=E4=BA=BA=E5=B7=A5=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E2=80=9D=E8=AE=A1=E7=AE=97=E8=BF=87=E5=A4=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/QuoteDetailBomTreeServiceImpl.java      | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 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 9dbfd163..af34c25e 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
@@ -189,12 +189,18 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
                 BomNodeData childNode = collectBomData(childDetail, -1L, level + 1, ifsConFactory);
                 if (childNode != null) {
                     nodeData.children.add(childNode);
+                    // 半成品：bomId 在写入阶段填充，先清零价格（IFS 并行阶段会覆盖）
+                    component.setBomFlag("Y");
+                    component.setUnitPrice(BigDecimal.ZERO);
+                    component.setActualPrice(BigDecimal.ZERO);
+                    component.setQuotePrice(BigDecimal.ZERO);
+                } else {
+                    // collectBomData 返回 null 说明该子物料在 PLM 中无可用 BOM 数据，
+                    // 必须降级为 "N"，否则该组件会占用 childIndex 槽位，
+                    // 导致后续真实半成品的 bomId 错位（bomId=null），进而使人工成本计算错误
+                    log.warn("[BOM_PROCESS] 半成品 {} 的 BOM 数据收集失败（collectBomData 返回 null），降级为普通采购件处理", component.getComponentPart());
+                    component.setBomFlag("N");
                 }
-                // 半成品：bomId 在写入阶段填充，先清零价格（IFS 并行阶段会覆盖）
-                component.setBomFlag("Y");
-                component.setUnitPrice(BigDecimal.ZERO);
-                component.setActualPrice(BigDecimal.ZERO);
-                component.setQuotePrice(BigDecimal.ZERO);
             } else {
                 component.setBomFlag("N");
             }