From 4cf50914a1d304d5e26bc579441838ec3a321c1d Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Thu, 28 Mar 2024 15:58:38 +0800
Subject: [PATCH] rootis ->userRootIs

---
 .../bomnew/service/BomNewEbomParentService.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 7fcd1570..e9e9b26b 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
@@ -1186,7 +1186,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         List<Long> rowIds = dto.getRowIdList();
 
-        List<BomNewEbomParentEntity> bomNewEbomParentEntityList = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, rowIds).eq(BomNewEbomParentEntity::getRootIs, 1).list();
+        List<BomNewEbomParentEntity> bomNewEbomParentEntityList = this.lambdaQuery().in(BomNewEbomParentEntity::getUserRootIs, rowIds).eq(BomNewEbomParentEntity::getUserRootIs, 1).list();
 
         if (CollUtil.isEmpty(bomNewEbomParentEntityList)) {
             // return ResultVO.error("下级BOM无法进行复核");
@@ -1586,6 +1586,18 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
 
         if (eBomEdit.getParentEntity() != null) {
+
+
+            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());
+
+
+
+            }
+
             this.saveOrUpdate(eBomEdit.getParentEntity());
         }