From 4e255dbf777d5733fcc600e832044bec51863b73 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Thu, 21 Mar 2024 11:36:12 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-21=20=E6=8A=A5=E4=BB=B7BOM=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quotation/service/impl/QuoteBomHeaderServiceImpl.java   | 2 +-
 .../service/impl/QuoteRoutingHeaderServiceImpl.java         | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/com/spring/modules/quotation/service/impl/QuoteBomHeaderServiceImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/QuoteBomHeaderServiceImpl.java
index c526d340..0ee0416f 100644
--- a/src/main/java/com/spring/modules/quotation/service/impl/QuoteBomHeaderServiceImpl.java
+++ b/src/main/java/com/spring/modules/quotation/service/impl/QuoteBomHeaderServiceImpl.java
@@ -160,7 +160,7 @@ public class QuoteBomHeaderServiceImpl extends ServiceImpl<QuoteBomHeaderMapper,
         // 新增默认header
         QuoteBomHeader quoteHeader = new QuoteBomHeader();
         if(Objects.isNull(bom)){
-            return quoteHeader;
+            return null;
         }
         quoteHeader.setBomType(bom.getBomType());
         quoteHeader.setVersion(bom.getEngChgLevel());
diff --git a/src/main/java/com/spring/modules/quotation/service/impl/QuoteRoutingHeaderServiceImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/QuoteRoutingHeaderServiceImpl.java
index 8635613e..687bf22c 100644
--- a/src/main/java/com/spring/modules/quotation/service/impl/QuoteRoutingHeaderServiceImpl.java
+++ b/src/main/java/com/spring/modules/quotation/service/impl/QuoteRoutingHeaderServiceImpl.java
@@ -100,20 +100,14 @@ public class QuoteRoutingHeaderServiceImpl extends ServiceImpl<QuoteRoutingHeade
             throw new RuntimeException("产品编码为空");
         }
         // 查询项目物料
-//        PlmProjectPart projectPart = quoteBomHeaderMapper.getProjectPart(site, testPartNo);
-//        if (Objects.isNull(projectPart) || StringUtils.isEmpty(projectPart.getFinalPartNo())){
-//            throw new RuntimeException("项目物料未维护正式物料编码");
-//        }
         QuoteRoutingHeader routingHeader = lambdaQuery()
                 .eq(QuoteRoutingHeader::getSite, site)
                 .eq(QuoteRoutingHeader::getQuoteDetailId, quoteDetailId)
-//                .eq(QuoteRoutingHeader::getPartNo, projectPart.getFinalPartNo()).one();
                 .eq(QuoteRoutingHeader::getPartNo, testPartNo).one();
         if (Objects.nonNull(routingHeader)){
             return routingHeader;
         }
         // 查询bom Header 不存在失效日期的bom
-//        RoutingHeaderEntity routingHeaderEntity = baseMapper.selectRoutingHeader(site,projectPart.getFinalPartNo());
         RoutingHeaderEntity routingHeaderEntity = baseMapper.selectRoutingHeader(site,testPartNo);
         // 新增 routing结构
         QuoteRoutingHeader routing = new QuoteRoutingHeader();