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 d54e64fd..90d6b28a 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
@@ -1106,7 +1106,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
     public void revertDesign(BomNewEBomRevertDTO dto) throws ExecutionException, InterruptedException {
 
         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::getRowId, rowIds).eq(BomNewEbomParentEntity::getUserRootIs, 1).list();
         if (CollUtil.isEmpty(bomNewEbomParentEntityList)) {
             VUtils.isTure(true).throwMessage("下级BOM无法进行退回，请选择顶层");
         }
@@ -1585,6 +1585,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());
         }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
index 81365e9b..d98822b6 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
@@ -244,7 +244,10 @@ public class EBomEdit {
 
 
         QueryWrapper<BomNewEbomChildEntity> queryChildWrapper=new QueryWrapper<>();
-        List<Long> rowIds=notNullRowIdList.stream().map(BomNewEbomParentVO::getRowId).collect(Collectors.toList());
+        List<Long> rowIds=notNullRowIdList.stream().filter(u->ObjectUtil.isNotNull(u.getRowId()) && u.getRowId()>0 ).map(BomNewEbomParentVO::getRowId).collect(Collectors.toList());
+       if(CollUtil.isEmpty(rowIds)){
+           return;
+       }
         queryChildWrapper.lambda().in(BomNewEbomChildEntity::getRowId,rowIds);
         List<BomNewEbomChildEntity> childList=SpringUtil.getBean(BomNewEbomChildService.class).list(queryChildWrapper);
 
@@ -285,7 +288,7 @@ public class EBomEdit {
         //缺bom
         if (dto.getParent().getBomRowId() == null || dto.getParent().getBomRowId().longValue() == 0) {
 
-            checkHadBom(dto.getParent().getMaterialNo());
+           checkHadBom(dto.getParent().getMaterialNo());
             dto.getParent().setBomRowId(dto.getParent().getRowId());
             parentEntity = createParentBomInfo(dto.getParent());