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 890d5018..3d7455dd 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无法进行退回，请选择顶层");
         }
@@ -1471,7 +1471,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         QueryWrapper<BomNewEbomParentEntity> queryWrapper=new QueryWrapper<>();
 
         queryWrapper.lambda() .eq(BomNewEbomParentEntity::getRowId, bomRowId)
-                .eq(BomNewEbomParentEntity::getRootIs, 1);
+                .eq(BomNewEbomParentEntity::getUserRootIs, 1);
 
         BomNewEbomParentEntity parentEntity = this.getBaseMapper().selectOne(queryWrapper);
 
@@ -1486,18 +1486,27 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 //        }
 
         //待复核和已退回才能删除
-        VUtils.isTure(parentEntity.getStatus().equals(EBomStatusEnum.WAIT_CHECK.getValue())
-                        || parentEntity.getStatus().equals(EBomStatusEnum.RETURNED.getValue()))
+
+        VUtils.isTure(!(parentEntity.getStatus().equals(EBomStatusEnum.WAIT_CHECK.getValue())
+                        || parentEntity.getStatus().equals(EBomStatusEnum.RETURNED.getValue())))
                 .throwMessage(EBomStatusEnum.findByValue(parentEntity.getStatus()).getDescription() + "状态不能删除");
 
         EBomDel eBomDel = new EBomDel(bomRowId);
         eBomDel.classifyBom();
 
         if (CollectionUtil.isNotEmpty(eBomDel.getDelEBom())) {
+
+
+        List<Long>  bomRowIdList=   eBomDel.getDelEBom().stream()
+                    .map(BomNewEbomParentVO::getBomRowId) .collect(Collectors.toList());
+
+
             //取bom信息删除
-            this.getBaseMapper().delBatch(eBomDel.getDelEBom().stream()
-                    .map(BomNewEbomParentVO::getBomRowId)
-                    .collect(Collectors.toList()));
+            this.getBaseMapper().delBatch(bomRowIdList);
+            QueryWrapper<BomNewEbomChildEntity > delChildQuery=new QueryWrapper<>();
+            delChildQuery.lambda().in(BomNewEbomChildEntity::getParentRowId,bomRowIdList);
+            SpringUtil.getBean(BomNewEbomChildService.class).getBaseMapper().delete(delChildQuery);
+
         }
 
 
@@ -1506,6 +1515,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             List<Long> rowIds = eBomDel.getRevertOBom().stream().map(BomNewEbomParentVO::getSourceRowId).collect(Collectors.toList());
             SpringUtil.getBean(BomNewOriginalParentService.class).revertBom(rowIds);
         }
+
+
+
+
         if (CollectionUtil.isNotEmpty(eBomDel.getDelEBom())) {
 
             ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
@@ -1672,12 +1685,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;
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());