From dc097a96cbf283cc7bc585842db9155849816f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 13 Apr 2024 09:31:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81BUG-89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/domain/EBom/EBomToPBom.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
index ce1b8ee9..af7c633b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
@@ -170,10 +170,12 @@ public class EBomToPBom {
             pBomParent.setFacCode(facCode);
             pBomParent.setTechnologyUserCode(SessionUtil.getUserCode());
             pBomParent.setTechnologyUserName(SessionUtil.getRealName());
-            pBomParent.setCurrentVersion(VersionUtil.getNextVersion(""));
+            //pBomParent.setCurrentVersion(VersionUtil.getNextVersion(""));
+            //版本=EBom版本
+            pBomParent.setCurrentVersion(parentVo.getCurrentVersion());
             pBomParent.setEditStatus(PBomEditStatusEnum.HANDLER_CREATED.getValue());
             if(Objects.nonNull(oldParent)){
-                pBomParent.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion()));
+               // pBomParent.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion()));
                 oldParent.setExpireEndTime(LocalDateTime.now());
                 oldParent.setLastVersionIs(0);
             }