From f6afff1bfbfacf2a70ae8b8e7719df1ab07cfa83 Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Wed, 6 Nov 2024 17:01:03 +0800
Subject: [PATCH] =?UTF-8?q?T=E9=A1=B9=E7=9A=84=E7=89=88=E6=9C=AC=E5=92=8C1?=
 =?UTF-8?q?1=E7=B1=BB=E4=B8=80=E6=A0=B7=EF=BC=8C=E9=83=BD=E6=98=AFB00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewPbomParentService.java     | 6 ++++--
 .../nflg/product/bomnew/service/ForwardReportService.java   | 6 ++++--
 .../bomnew/service/domain/EBom/EBomForwardReport.java       | 6 +++---
 .../bomnew/service/domain/PBom/PBomForwardReport.java       | 6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 0269ba6b..45ba7a93 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -402,7 +402,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                         child.setTechnologyUserCode(parent.getTechnologyUserCode());
                         child.setTechnologyUserName(parent.getTechnologyUserName());
                         // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
-                        if(MaterialshouldBomExistUtil.checkNoNeedBom(child)){
+                        if(MaterialshouldBomExistUtil.checkNoNeedBom(child) ||
+                        Objects.equals("T",child.getProjectType())){
                             child.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                         }else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                             child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
@@ -487,7 +488,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                         //child.setSource(Objects.nonNull(parent) ? parent.getSource() : EBomSourceEnum.FROM_BOM.getValue());
                         child.setBomRowId(0L);
                         // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
-                        if(MaterialshouldBomExistUtil.checkNoNeedBom(child)){
+                        if(MaterialshouldBomExistUtil.checkNoNeedBom(child) ||
+                                Objects.equals("T",child.getProjectType())){
                             child.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                         }else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                             child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
index 6a8c3f01..754b6c7a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
@@ -251,7 +251,8 @@ public class ForwardReportService {
                     vo.setExpireEndTime(parentEntity.getExpireEndTime());
                 }
                 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
-                if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){
+                if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) ||
+                Objects.equals("T",vo.getProjectType())){
                     vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                 }else if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) {
                     vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
@@ -349,7 +350,8 @@ public class ForwardReportService {
                 }
 
                 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
-                if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){
+                if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) ||
+                Objects.equals("T",vo.getProjectType())){
                     vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                 }else if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) {
                     vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
index 0d5d9e84..428579c5 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
@@ -312,7 +312,7 @@ public class EBomForwardReport extends BaseForwardReport {
                 item.setBomVersion(parentFormal.getCurrentVersion());
 
                 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
-                if(MaterialshouldBomExistUtil.checkNoNeedBom(item)){
+                if(MaterialshouldBomExistUtil.checkNoNeedBom(item) || Objects.equals("T",item.getProjectType())){
                     item.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                 }
             });
@@ -492,7 +492,7 @@ public class EBomForwardReport extends BaseForwardReport {
                 //  vo.setDeviseName(parentFormal.getDeviseName());
                // vo.setExpireEndTime(parentFormal.getConvertToEbomTime());
                 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
-                if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){
+                if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
                     vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                 }
             }
@@ -535,7 +535,7 @@ public class EBomForwardReport extends BaseForwardReport {
                     vo.setOrderNumber(orderNum.incrementAndGet() + "");
 
                     // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
-                    if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){
+                    if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
                         vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                     }
                 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
index 8e2cb43e..dd612fb7 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
@@ -324,7 +324,7 @@ public class PBomForwardReport  extends BaseForwardReport {
             nodeList.forEach(item->{
                 item.setBomVersion(parentFormal.getCurrentVersion());
                 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
-                if(MaterialshouldBomExistUtil.checkNoNeedBom(item)){
+                if(MaterialshouldBomExistUtil.checkNoNeedBom(item) || Objects.equals("T",item.getProjectType())){
                     item.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                 }
             });
@@ -521,7 +521,7 @@ public class PBomForwardReport  extends BaseForwardReport {
               //  vo.setCreatedTime(parentFormal.getCreatedTime());
                // vo.setExpireEndTime(parentFormal.getReleaseTime());
                 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
-                if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){
+                if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
                     vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                 }
             }
@@ -561,7 +561,7 @@ public class PBomForwardReport  extends BaseForwardReport {
                     //    vo.setLevelNum(1);
                     vo.setOrderNumber(orderNum.incrementAndGet() + "");
                     // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
-                    if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){
+                    if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
                         vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                     }
                 }