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 42901635..e8bf765c 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
@@ -896,7 +896,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                  pBomParentService.getBaseMapper().updateWaitPublicRootState(materialNos);
             }
             //标记跟节点
-            upRootMark(parent);
+//            upRootMark(parent);
 //            if (CollUtil.isNotEmpty(eBomToPBom.getVirtualPackageCompositionResult())) {
 //                //先删除
 //                Set<String> delSet = eBomToPBom.getVirtualPackageCompositionResult().stream().map(u -> StrUtil.join("-", u.getVirtualPackageMaterialNo(), u.getParentMaterialNo())).collect(Collectors.toSet());
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 c25a292c..c695c183 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
@@ -151,6 +151,7 @@ public abstract class EBomToPbomBase {
         if (Objects.nonNull(oldParent) && oldParent.getStatus()< EBomStatusEnum.PUBLISHED.getValue()) {
             SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
             oldParent.setCurrentVersion(parentVo.getCurrentVersion());
+            oldParent.setSourceRowId(parentVo.getRowId());
             this.pBomParentResult.add(oldParent);
             return oldParent;
         } else {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
index bf33ac38..dd96d7b2 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
@@ -251,11 +251,11 @@
     <!--更新待发布根节点状态-->
     <update id="updateWaitPublicRootState">
         update    t_bom_new_pbom_parent a   left join  (
-        select   b.material_no , a.fac_code  from t_bom_new_pbom_parent a  join t_bom_new_pbom_child b on a.row_id=b.parent_row_id  and   a.`status`  &lt; 4 and a.last_version_is=1
+        select   b.material_no , a.fac_code  from t_bom_new_pbom_parent a  join t_bom_new_pbom_child b on a.row_id=b.parent_row_id  and   a.`status`  &lt; 4
         and b.material_no in <include refid="upRootStateWhr"/>
         ) b   on a.material_no=b.material_no and a.fac_code =b.fac_code
         set  a.root_state=1
-        where a.`status` &lt; 4   and last_version_is=1 and b.material_no  is null
+        where a.`status` &lt; 4   and b.material_no  is null
         and  a.material_no  in <include refid="upRootStateWhr"/>
 
     </update>