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 fe7b070f..e29442dd 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
@@ -1230,30 +1230,44 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
 
         BomNewEbomParentEntity bomParent=null;
+        BomNewEbomChildEntity childEntity=null;
 
-        if(query.getBomRowId()!=null){
+        if(query.getBomRowId()!=null && query.getBomRowId().longValue()!=0){
             bomParent= getById(query.getBomRowId());
         }
+        if(query.getRowId()!=null  && query.getRowId().longValue()!=0){
+            childEntity= SpringUtil.getBean(BomNewEbomChildService.class).getById(query.getRowId());
+        }
 
 
 
         if (CollUtil.isNotEmpty(materialMainList)) {
             MaterialMainEntity materialMainEntity = materialMainList.get(0);
             BomNewEbomParentVO baseMaterialVO = new BomNewEbomParentVO();
+
+            if(childEntity!=null){
+                BeanUtil.copyProperties(childEntity, baseMaterialVO);
+                if(childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo())){
+                    return baseMaterialVO;
+                }
+            }
+
             BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
-
             SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO));
 
-
          //   baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
             baseMaterialVO.setRowId(query.getRowId());
-            materialMainEntity.setProjectType(null);
+            baseMaterialVO.setParentRowId(query.getBomRowId());
+            baseMaterialVO.setProjectType(null);
             baseMaterialVO.setDeptName(SessionUtil.getDepartName());
             baseMaterialVO.setDeviseUserCode(SessionUtil.getUserCode());
             baseMaterialVO.setDeviseName(SessionUtil.getRealName());
             baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
             baseMaterialVO.setCreatedTime(LocalDateTime.now());
             baseMaterialVO.setModifyTime(LocalDateTime.now());
+            baseMaterialVO.setSource(EBomSourceEnum.FROM_MDM.getValue());
+
+
             if(StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) {
                 baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
             }