From f61c426a13a6fe3b5738f65a00375e5a965ad3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 18 Jul 2024 18:20:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/domain/EBom/EBomToPBomFor31.java     | 2 +-
 .../src/main/resources/mapper/master/BomNewEbomParentMapper.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
index 65dd42d7..ae74b214 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
@@ -68,7 +68,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
             data1010.add(parent);
             for (BomNewEbomParentVO data : deliveryPackage1010) {
                 List<BomNewEbomParentVO> subVos = new ArrayList<>();
-                if (data.getMaterialName().contains("仙桃")) { //只获取下降虚拟包
+                if (data.getMaterialName().contains("仙桃") && !VirtualPackageTypeEnum.PAINT_PACKAGE.equalsValue(data.getVirtualPartType())) { //只获取下降虚拟包(排除仙桃油漆包)
                     subVos.add(data);
                     subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList()));
                 } else {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 8c5e6642..19756e84 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -533,6 +533,7 @@
           AND (root_is = 1 OR user_root_is = 1)
           AND sap_state > 3
           AND created_by = #{userCode}
+          <include refid="whr"/>
         ORDER BY release_time DESC
     </select>
     <select id="getSapErrorNum" resultType="java.lang.Integer">