From 0f214045ecd3498475c3db962d4a41ee73734aeb Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 15 Dec 2025 10:06:39 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-15=201=E3=80=81=E6=8A=A5=E4=BB=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AD=90=E7=89=A9=E6=96=99=EF=BC=88=E5=8D=8A=E6=88=90?=
 =?UTF-8?q?=E5=93=81=EF=BC=89BOM=E6=97=B6=E6=8C=89=E5=AD=90=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E6=9D=A5?=
 =?UTF-8?q?=E5=8F=96BOM=EF=BC=8C=E9=A1=B6=E7=BA=A7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A"Manufacturing";=202=E3=80=81=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9CBOM=E7=B1=BB=E5=9E=8B=E6=98=AF=20Purchase=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=94=E6=B2=A1=E6=9C=89=E5=AD=90=E7=89=A9=E6=96=99=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E7=89=A9=E6=96=99=E8=87=AA=E8=BA=AB=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=BA=E5=AD=90=E7=89=A9=E6=96=99=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/QuoteDetailBomTreeServiceImpl.java   | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 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 1d942a24..dd8967ec 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
@@ -75,19 +75,24 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
             // 顶级物料强制使用 Manufacturing 类型
             detail.setBomType("Manufacturing");
         }else {
-            // 子物料根据物料类型来确定BOM类型
+            // 子物料：先查询物料信息
             PartInformationEntity part = baseMapper.queryPart(detail.getSite(),detail.getPartNo());
             if (Objects.nonNull(part) && "Y".equals(part.getStatus())){
                 detail.setPartNo(part.getPartNo());
             }
-            // 查询物料类型，根据物料类型设置BOM类型
-            String partType = baseMapper.queryPartType(detail.getSite(), detail.getPartNo());
-            if ("Manufactured".equals(partType) || "Manufactured Recipe".equals(partType)) {
-                detail.setBomType("Manufacturing");
-            } else if ("Purchased".equals(partType)) {
-                detail.setBomType("Purchase");
+            // 只有在bomType为空时（新增报价单场景），才根据物料类型自动设置BOM类型
+            // 切换版本时，bomType已经由用户选择，保留用户的选择
+            if (detail.getBomType() == null || detail.getBomType().isEmpty()) {
+                String partType = baseMapper.queryPartType(detail.getSite(), detail.getPartNo());
+                if ("Manufactured".equals(partType) || "Manufactured Recipe".equals(partType)) {
+                    detail.setBomType("Manufacturing");
+                } else if ("Purchased".equals(partType)) {
+                    detail.setBomType("Purchase");
+                }
+                log.info("子物料 {} 的物料类型为 {}，BOM类型自动设置为 {}", detail.getPartNo(), partType, detail.getBomType());
+            } else {
+                log.info("子物料 {} 使用用户选择的BOM类型 {}", detail.getPartNo(), detail.getBomType());
             }
-            log.info("子物料 {} 的物料类型为 {}，BOM类型设置为 {}", detail.getPartNo(), partType, detail.getBomType());
         }
         // 获取BOM信息
         QuoteDetailBomTree bom =  baseMapper.queryPartBom(detail);