diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java
index e45679d7..ad82a013 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java
@@ -66,7 +66,7 @@ public class EBomDetailTask extends RecursiveTask<List<BomNewEbomParentVO>> {
                     detailVO.setDeptName(ebomParentEntity.getDeptName());
                     detailVO.setDeviseName(ebomParentEntity.getDeviseName());
                     detailVO.setBomExist(ebomParentEntity.getBomExist());
-
+                    detailVO.setStatus(ebomParentEntity.getStatus());
                 }
             }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
index 809485de..6aa6f895 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
@@ -83,7 +83,7 @@ public class EBomToPBom {
         check();
         //bom 提层
         liftingLayer();
-        List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList());
+        List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0 && u.getStatus()<PBomStatusEnum.PUBLISH.getValue()).collect(Collectors.toList());
         List<String> hasConvert=new ArrayList<>();
 
         for (String facCode : facCodes) {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
index 639d1548..2a102c74 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
@@ -96,7 +96,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
 
 
         //处理子级
-        List<BomOriginalListVO> bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList());
+        List<BomOriginalListVO> bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0 && ( OriginalStatusEnum.UN_CONVERT.equalsValue(u.getStatus()) || OriginalStatusEnum.REFERENCE.equalsValue(u.getStatus()))  ).collect(Collectors.toList());
         for (BomOriginalListVO childParent : bomParents) {
             hanlerDo(childParent);
             this.hasHandlerParentIds.add(childParent.getBomRowId());
@@ -315,7 +315,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
         if(parentMap.containsKey(parentEnt.getMaterialNo())){
             return parentMap.get(parentEnt.getMaterialNo()).getRowId();
         }
-        BomNewEbomParentEntity ebom = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).eq(BomNewEbomParentEntity::getLastVersionIs, 1).one();
+        BomNewEbomParentEntity ebom = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).last(" order by current_version desc limit 1").one();
         BomNewEbomParentEntity eBomParent = new BomNewEbomParentEntity();
         BeanUtil.copyProperties(parentEnt, eBomParent, "materialGetType");
         eBomParent.setRowId(parentEnt.getEBomRowId() > 0 ? parentEnt.getEBomRowId() : IdWorker.getId());