diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index 48532f26..a7d90f47 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -188,15 +188,13 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
 //                }
                 List<String> parentDrawingNos = new ArrayList<>(getParentMaterialByDrawingNo(queryDrawingNos));
 //                parentDrawingNos.addAll(queryDrawingNos);
-                Set<String> parentDrawingNos = new HashSet<>(getParentDrawingNoByMaterialNo(queryDrawingNos));
-                parentDrawingNos.addAll(queryDrawingNos);
                 if (CollUtil.isNotEmpty(parentDrawingNos)) {
                     List<BomOriginalListVO> childs=new ArrayList<>();
                     List<BomOriginalListVO> parents = this.getBaseMapper().getParentForDrawingNoSeach(parentDrawingNos, query.getStatus());
-                    materialMainService.intiMaterialInfo(parents, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
-                    if(CollUtil.isNotEmpty(parents)) {
-                        childs = this.getBaseMapper().getChildForDrawingNoSeach(parentDrawingNos, parents.stream().map(u -> u.getRowId()).collect(Collectors.toSet()));
-                        materialMainService.intiMaterialInfo(childs, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
+                    materialMainService.intiMaterialInfo(parents, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
+                    if (CollUtil.isNotEmpty(parents)) {
+                        childs = this.getBaseMapper().getChildForDrawingNoSeach(parentDrawingNos, parents.stream().map(BomOriginalListVO::getRowId).collect(Collectors.toSet()));
+                        materialMainService.intiMaterialInfo(childs, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
                         childs.stream().filter(f -> StrUtil.isBlank(f.getCurrentVersion())).forEach(f -> {
                             if (MaterialshouldBomExistUtil.checkShouldBomExist(f.getMaterialCategoryCode(), f.getMaterialGetType())) {
                                 f.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
@@ -205,20 +203,6 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
                             }
                         });
                     }
-//                    List<BomOriginalListVO> data = new ArrayList<>();
-//                    data.addAll(parents);
-//                    data.addAll(childs);
-//                    materialMainService.intiMaterialInfo(data, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
-                    materialMainService.intiMaterialInfo(parents, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
-                    List<BomOriginalListVO> childs = this.getBaseMapper().getChildForDrawingNoSeach(parentDrawingNos,query.getStatus());
-                    materialMainService.intiMaterialInfo(childs, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
-                    childs.stream().filter(f -> StrUtil.isBlank(f.getCurrentVersion())).forEach(f -> {
-                        if (MaterialshouldBomExistUtil.checkShouldBomExist(f.getMaterialCategoryCode(), f.getMaterialGetType())) {
-                            f.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
-                        } else {
-                            f.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
-                        }
-                    });
                     result = handSeachToTree(parents, childs);
                 }
             }