diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 494bc378..5b3dca9e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -377,6 +377,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                         }
                     } else {   //无BOM-版本时 确定版本号
                         //child.setSource(Objects.nonNull(parent) ? parent.getSource() : EBomSourceEnum.FROM_BOM.getValue());
+                        child.setBomRowId(0L);
                         child.setDeviseUserCode(parent.getDeviseUserCode());
                         child.setDeviseName(parent.getDeviseName());
                         child.setDeptName(parent.getDeptName());
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 29d06d96..cd4bef33 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
@@ -159,9 +159,10 @@
     </select>
 
     <select id="getParentChild" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
-        select *,bom_version_row_id as bom_row_id
-        from t_bom_new_pbom_child
-        where parent_row_id = #{parentRowId}
+        select b.*,b.bom_version_row_id as bom_row_id
+
+        from t_bom_new_pbom_parent a join   t_bom_new_pbom_child b  on a.row_id=b.parent_row_id and a.fac_code=b.fac_code
+        where a.row_id=#{parentRowId}
         order by order_number
     </select>