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 6aa6f895..c39ada39 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 && u.getStatus()<PBomStatusEnum.PUBLISH.getValue()).collect(Collectors.toList());
+        List<BomNewEbomParentVO> parentList = result.stream().filter(u -> u.getBomRowId() > 0 && u.getStatus()<EBomStatusEnum.PUBLISHED.getValue()).collect(Collectors.toList());
         List<String> hasConvert=new ArrayList<>();
 
         for (String facCode : facCodes) {
@@ -157,7 +157,7 @@ public class EBomToPBom {
     private BomNewPbomParentEntity buildPBomParent(BomNewEbomParentVO parentVo, String facCode) {
         BomNewPbomParentEntity oldParent = SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery()
                 .eq(BomNewPbomParentEntity::getMaterialNo, parentVo.getMaterialNo())
-                .eq(BomNewPbomParentEntity::getFacCode, facCode).eq(BomNewPbomParentEntity::getLastVersionIs,1).one();
+                .eq(BomNewPbomParentEntity::getFacCode, facCode).last(" order by current_version desc limit 1").one();
 
        // this.hasConvertEBomRowIds.add(parentVo.getRowId());
         if (Objects.nonNull(oldParent) && !EBomStatusEnum.PUBLISHED.equalsValue(oldParent.getStatus())) {
@@ -176,7 +176,7 @@ public class EBomToPBom {
             pBomParent.setTechnologyUserName(SessionUtil.getRealName());
             pBomParent.setCurrentVersion(VersionUtil.getNextVersion(""));
             if(Objects.nonNull(oldParent)){
-                parentVo.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion()));
+                pBomParent.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion()));
                 oldParent.setExpireEndTime(LocalDateTime.now());
                 oldParent.setLastVersionIs(0);
             }