From d10962d79c1ae625af40170478e3adced253c42a Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Sun, 31 Mar 2024 10:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=E3=80=81=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=20=E9=9D=9E=E5=AE=9A=E7=89=88=E7=9B=B8=E5=90=8CBom=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 49 ++++++++++++-------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index b2dd9d68..4ce3255a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1522,8 +1522,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         if (CollectionUtil.isNotEmpty(eBomDel.getDelEBom())) {
 
-            ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
-            // computeLevelNumAndRootState();
+            //ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
+           computeLevelNumAndRootState();
         }
 
         return true;
@@ -1600,15 +1600,20 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         if (eBomEdit.getParentEntity() != null) {
 
+            //同一物料且存在一个 lastVersionIs=1
+            if(ObjectUtil.isNotNull(eBomEdit.getParentEntity().getLastVersionIs())
+                    && ObjectUtil.equal(eBomEdit.getParentEntity().getLastVersionIs(),1L)) {
+                BomNewEbomParentEntity   oldParent=  this.lambdaQuery()
+                        .eq(BomNewEbomParentEntity::getMaterialNo, eBomEdit.getParentEntity().getMaterialNo())
+                        .eq(BomNewEbomParentEntity::getLastVersionIs,1)
+                        .ne(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue())
+                        .ne(BomNewEbomParentEntity::getRowId,  eBomEdit.getParentEntity().getRowId())
+                        .one();
 
-            if(ObjectUtil.isNotNull(eBomEdit.getParentEntity().getLastVersionIs()) && ObjectUtil.equal(eBomEdit.getParentEntity().getLastVersionIs(),1)) {
-                QueryWrapper<BomNewEbomParentEntity> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(BomNewEbomParentEntity::getMaterialNo, eBomEdit.getParentEntity().getMaterialNo());
-                queryWrapper.lambda().eq(BomNewEbomParentEntity::getLastVersionIs, 1);
-                queryWrapper.lambda().notIn(BomNewEbomParentEntity::getRowId, eBomEdit.getParentEntity().getRowId());
-
-
-
+                if(Objects.nonNull(oldParent)){
+                    oldParent.setLastVersionIs(0);
+                  this.updateById(oldParent);
+                }
             }
 
             this.saveOrUpdate(eBomEdit.getParentEntity());
@@ -1664,6 +1669,23 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
 
         if (eBomEdit.getParentEntity() != null) {
+
+            //同一物料且存在一个 lastVersionIs=1
+            if(ObjectUtil.isNotNull(eBomEdit.getParentEntity().getLastVersionIs())
+                    && ObjectUtil.equal(eBomEdit.getParentEntity().getLastVersionIs(),1L)) {
+                BomNewEbomParentEntity   oldParent=  this.lambdaQuery()
+                        .eq(BomNewEbomParentEntity::getMaterialNo, eBomEdit.getParentEntity().getMaterialNo())
+                        .eq(BomNewEbomParentEntity::getLastVersionIs,1)
+                        .ne(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue())
+                        .ne(BomNewEbomParentEntity::getRowId,  eBomEdit.getParentEntity().getRowId())
+                        .one();
+
+                if(Objects.nonNull(oldParent)){
+                    oldParent.setLastVersionIs(0);
+                    this.updateById(oldParent);
+                }
+            }
+
             this.saveOrUpdate(eBomEdit.getParentEntity());
 
         }
@@ -1686,13 +1708,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         // checkAndSaveEBomException(dto.getParent().getBomRowId());
 
-        List<BomNewEbomParentVO> childList = dto.getDatas();
-
-        if (dto.getParent().getRootIs() == null || dto.getParent().getRootIs() == 0) {
-            childList.add(dto.getParent());
-
-        }
-
 
         return true;