From 7c5980e821b2e19cfdbbe9759e168ecfb651d456 Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Fri, 1 Nov 2024 16:53:30 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81PBOM=20=20=20=E3=80=90BOM=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E3=80=91=20=E7=94=9F=E6=88=90=E5=B0=8F=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7.0a=202=E3=80=81EBOM=E7=94=9F=E6=88=90PBOM?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B0=86PBOM=E4=B8=8B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E5=AD=90=E9=A1=B9=E7=BB=99=E8=87=AA=E5=8A=A8=E5=B8=A6?=
 =?UTF-8?q?=E8=BF=87=E6=9D=A5=E6=97=B6=E8=BF=87=E6=BB=A4=E6=8E=89K?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewPbomParentService.java  | 4 ++--
 .../service/domain/EBom/topbomnew/FormalEBomToPbomBase.java   | 3 ++-
 2 files changed, 4 insertions(+), 3 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 7d6b7a4d..2fd8efd4 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
@@ -1482,8 +1482,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         pbomParent.setCreatedBy(SessionUtil.getUserCode());
         pbomParent.setStatus(PBomStatusEnum.FACTORY_CONFIRM.getValue());
         pbomParent.setEditStatus(PBomEditStatusEnum.HANDLER_FINISHED.getValue());
-        //获取大版本号
-        pbomParent.setCurrentVersion(VersionUtil.getNextVersion(rootVo.getCurrentVersion()));
+        //获取大版本号  生成小小版本号.0a
+        pbomParent.setCurrentVersion(VersionUtil.getPBomUpgradNextVersion(rootVo.getCurrentVersion()));
         pbomParent.setDeptRowId(SessionUtil.getDepartRowId());
         pbomParent.setDeptName(SessionUtil.getDepartName());
         pbomParent.setDeviseName(SessionUtil.getRealName());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
index 3f14568b..25e6d98e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
@@ -253,7 +253,8 @@ public abstract class FormalEBomToPbomBase {
             List<BomNewPbomParentVO> oldChildren=SpringUtil.getBean(BomNewPbomParentService.class).getChild(oldParent.getRowId(),1);
 
             //pBom 手工新增物料
-            List<BomNewPbomParentVO> oldPBomAddChildren = oldChildren.stream().filter(u -> StrUtil.isBlank(u.getOriginalMaterialNo())).collect(Collectors.toList());
+            //过滤掉K项的记录 10002327 241101
+            List<BomNewPbomParentVO> oldPBomAddChildren = oldChildren.stream().filter(u -> StrUtil.isBlank(u.getOriginalMaterialNo()) && !Objects.equals("K",u.getProjectType())).collect(Collectors.toList());
             Map<String, BomNewEbomParentVO> newBomChildrenMap = newBomChildren.stream().collect(Collectors.toMap(BomNewEbomParentVO::getMaterialNo, Function.identity(),(u,u1) -> u));
 
             for (BomNewPbomParentVO oldPBomAddItem : oldPBomAddChildren) {