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 eb7e7b0b..cc921574 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
@@ -68,6 +68,7 @@ public class EBomDetailTask extends RecursiveTask<List<BomNewEbomParentVO>> {
                     detailVO.setBomExist(ebomParentEntity.getBomExist());
                     detailVO.setStatus(ebomParentEntity.getStatus());
                     detailVO.setBatchNo(ebomParentEntity.getBatchNo());
+                    detailVO.setCreatedBy(ebomParentEntity.getCreatedBy());
                 }
             }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalDetailTask.java
index bfcb74a2..705137d2 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalDetailTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalDetailTask.java
@@ -76,6 +76,7 @@ public class EBomFormalDetailTask extends RecursiveTask<List<BomNewEbomParentVO>
                     detailVO.setBomExist(ebomParentEntity.getBomExist());
                     detailVO.setStatus(ebomParentEntity.getStatus());
                     detailVO.setBatchNo(ebomParentEntity.getBatchNo());
+                    detailVO.setCreatedBy(ebomParentEntity.getCreatedBy());
                 }
             }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
index 82aa6a92..6a3a89fa 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
@@ -80,8 +80,8 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase {
         check();
         //bom 提层
         liftingLayer();
-        result.forEach(u->u.setLevelNo(""));
-        generateDrawingNo(result, parent.getRowId(), "1");
+//        result.forEach(u->u.setLevelNo(""));
+//        generateDrawingNo(result, parent.getRowId(), "1");
         splitData();
         List<String> hasConvert = new ArrayList<>();
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
index 3cdd2a3f..710c1521 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
@@ -167,8 +167,8 @@ public abstract class EBomToPbomBase {
         }
         //pbom 处于工作表
        else if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) {
-            if (oldParent.getCreatedBy() == parentVo.getCreatedBy()) {
-                if (ConvertToPBomModelEnum.OVERRIDE.equals(convertMode.getValue())) {
+            if (oldParent.getCreatedBy().equals( parentVo.getCreatedBy())) {
+                if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) {
                     SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
                     oldParent.setCurrentVersion(parentVo.getCurrentVersion());
                     oldParent.setSourceRowId(parentVo.getRowId());
@@ -233,31 +233,29 @@ public abstract class EBomToPbomBase {
      */
     protected void liftingLayer() {
         for (BomNewEbomParentVO vo : allBomDetail) {
-            BomNewEbomParentVO newVo=new BomNewEbomParentVO();
-            BeanUtil.copyProperties(vo,newVo);
             if (StrUtil.isNotBlank(vo.getProjectType()) && vo.getProjectType().equals(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey())) {
                 BomNewEbomParentVO lastVirtualPackage = getLastVirtualPackage(vo, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE);
                 if (Objects.nonNull(lastVirtualPackage)) {
-                    liftingLayerSummary(lastVirtualPackage, newVo);
-                    newVo.setSourceRowId(String.valueOf(vo.getParentRowId()));
-                    newVo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId()));
-                    newVo.setParentRowId(lastVirtualPackage.getBomRowId());
-                    result.add(newVo);
+                    liftingLayerSummary(lastVirtualPackage, vo);
+                    vo.setSourceRowId(String.valueOf(vo.getParentRowId()));
+                    vo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId()));
+                    vo.setParentRowId(lastVirtualPackage.getBomRowId());
+                    result.add(vo);
                 }
                 continue;
             }
             if (StrUtil.isNotBlank(vo.getProjectType()) && vo.getProjectType().equals(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey())) {
                 BomNewEbomParentVO lastVirtualPackage = getLastVirtualPackage(vo, VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
                 if (Objects.nonNull(lastVirtualPackage)) {
-                    liftingLayerSummary(lastVirtualPackage, newVo);
+                    liftingLayerSummary(lastVirtualPackage, vo);
                     vo.setSourceRowId(String.valueOf(vo.getParentRowId()));
                     vo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId()));
                     vo.setParentRowId(lastVirtualPackage.getBomRowId());
-                    result.add(newVo);
+                    result.add(vo);
                 }
                 continue;
             }
-            result.add(newVo);
+            result.add(vo);
         }
     }