diff --git a/src/main/java/com/xujie/sys/modules/part/entity/ComponentPartData.java b/src/main/java/com/xujie/sys/modules/part/entity/ComponentPartData.java
index 3f588d34..dbcbca3e 100644
--- a/src/main/java/com/xujie/sys/modules/part/entity/ComponentPartData.java
+++ b/src/main/java/com/xujie/sys/modules/part/entity/ComponentPartData.java
@@ -43,4 +43,8 @@ public class ComponentPartData extends QueryPage {
     private BomDetailEntity bomDetail;
 
     private String mainPart;
+
+    private String nodeId;
+
+    private Integer engChgLevel;
 }
diff --git a/src/main/java/com/xujie/sys/modules/part/entity/PlmQuicklyBomInfoEntity.java b/src/main/java/com/xujie/sys/modules/part/entity/PlmQuicklyBomInfoEntity.java
index c5311ece..5d4774a3 100644
--- a/src/main/java/com/xujie/sys/modules/part/entity/PlmQuicklyBomInfoEntity.java
+++ b/src/main/java/com/xujie/sys/modules/part/entity/PlmQuicklyBomInfoEntity.java
@@ -71,6 +71,26 @@ public class PlmQuicklyBomInfoEntity {
      */
     private String printUnitName;
 
+    private String engChgLevel;
+
+    private String routingRevision;
+
+    public String getEngChgLevel() {
+        return engChgLevel;
+    }
+
+    public void setEngChgLevel(String engChgLevel) {
+        this.engChgLevel = engChgLevel;
+    }
+
+    public String getRoutingRevision() {
+        return routingRevision;
+    }
+
+    public void setRoutingRevision(String routingRevision) {
+        this.routingRevision = routingRevision;
+    }
+
     /**
      * 数据集
      */
diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/RoutingManagementServiceImpl.java
index d0dd544a..61f317fd 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/RoutingManagementServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/RoutingManagementServiceImpl.java
@@ -731,6 +731,7 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
         PartSubPropertiesValueData valueData = new PartSubPropertiesValueData();
         valueData.setSite(data.getSite());
         valueData.setBuNo(data.getBuNo());
+        valueData.setCodeNo(data.getCodeNo());
         valueData.setRecordType("IP");
         valueData.setPartNo(data.getPartNo());
         List<PartSubPropertiesValueData> partItems = partInformationMapper.getItemModal(valueData);
diff --git a/src/main/java/com/xujie/sys/modules/part/vo/RoutingHeaderVo.java b/src/main/java/com/xujie/sys/modules/part/vo/RoutingHeaderVo.java
index 70323cdf..4482443d 100644
--- a/src/main/java/com/xujie/sys/modules/part/vo/RoutingHeaderVo.java
+++ b/src/main/java/com/xujie/sys/modules/part/vo/RoutingHeaderVo.java
@@ -52,4 +52,6 @@ public class RoutingHeaderVo extends RoutingHeaderEntity {
      * 更新人中文描述
      */
     private String updateByDesc;
+
+    private String codeNo;
 }
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 47d4f98b..ad84b170 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -117,7 +117,7 @@
                 AND a.part_desc like '%' +  #{query.partDesc} + '%'
             </if>
             <if test = "query.mainPart != null and query.mainPart != ''">
-                AND NOT EXISTS (SELECT 1 FROM plm_quickly_bom_Info b WHERE b.main_part = #{query.mainPart} AND b.part_no = a.part_no)
+                AND NOT EXISTS (SELECT 1 FROM plm_quickly_bom_Info b WHERE b.main_part = #{query.mainPart} AND b.part_no = a.part_no AND b.eng_chg_level = #{query.engChgLevel} AND b.node_id = #{query.nodeId})
             </if>
             and (a.part_type2 <![CDATA[<>]]> 'Purchased (raw)' or a.part_type2 is null)
             and a.active = 'Y'
diff --git a/src/main/resources/mapper/part/QuicklyCreateBomMapper.xml b/src/main/resources/mapper/part/QuicklyCreateBomMapper.xml
index 65b2c909..3dd0b94a 100644
--- a/src/main/resources/mapper/part/QuicklyCreateBomMapper.xml
+++ b/src/main/resources/mapper/part/QuicklyCreateBomMapper.xml
@@ -20,7 +20,9 @@
             a.update_date,
             a.update_by,
             b.umid2 as printUnit,
-            dbo.qc_get_um_name(a.site, b.umid2) as printUnitName
+            dbo.qc_get_um_name(a.site, b.umid2) as printUnitName,
+            a.eng_chg_level,
+            a.routing_revision
         FROM plm_quickly_bom_Info as a
         left join part as b on a.site = b.site and a.part_no = b.part_no
         <where>
@@ -133,7 +135,8 @@
         a.update_date,
         a.update_by,
         b.umid2 as printUnit,
-        dbo.qc_get_um_name(a.site, b.umid2) as printUnitName
+        dbo.qc_get_um_name(a.site, b.umid2) as printUnitName,
+        b.code_no
         FROM plm_routing_header as a
         left join part as b on a.site = b.site and a.bu_no = b.sourceBu and a.part_no = b.part_no
         left join plm_routing_detail as d on a.site = d.site and a.bu_no = d.bu_no and a.part_no = d.part_no and a.routing_revision = d.routing_revision and a.routing_type = d.routing_type
diff --git a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
index bcba70df..f24d8f4a 100644
--- a/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
@@ -55,7 +55,46 @@
     </select>
 
     <select id="queryPartBom" resultType="com.xujie.sys.modules.quote.entity.QuoteDetailBomTree">
-        select top 1 bd.site,
+        select top 1 * from (
+        select top 1
+        bd.site,
+        #{buNo} as bu_no,
+        bd.part_no,
+        bd.alternative_no,
+        bd.bom_type,
+        bd.eng_chg_level,
+        #{quoteId} as quote_id,
+        #{quoteNo} as quote_no,
+        #{id} as quote_detail_id,
+        #{itemNo} as quote_detail_item_no,
+        #{versionNo} as version_no,
+        1 as priority
+        from plm_bom_detail bd
+        left join plm_bom_header bh
+        on bd.site = bh.site and bd.part_no = bh.part_no and bd.bu_no = bh.bu_no
+        and bd.bom_type = bh.bom_type and bd.eng_chg_level = bh.eng_chg_level
+        inner join plm_quickly_bom_Info pqbi on bd.site = pqbi.site and bd.part_no = pqbi.part_no and bd.eng_chg_level = pqbi.eng_chg_level
+        where bd.site = #{site}
+        and bd.part_no = #{partNo}
+        and bd.status != 'Tentative'
+        <if test="engChgLevel == null">
+            and bh.eff_phase_out_date is null
+        </if>
+        <if test="engChgLevel != null">
+            and bh.eng_chg_level = #{engChgLevel}
+        </if>
+        <if test="alternativeNo != null and alternativeNo != ''">
+            and bd.alternative_no = #{alternativeNo}
+        </if>
+        <if test="alternativeNo == null or alternativeNo == ''">
+            and bd.alternative_no = '*'
+        </if>
+        order by bh.eff_phase_in_date desc,bh.create_date desc
+
+        union all
+
+        select top 1
+        bd.site,
         #{buNo} as bu_no,
         bd.part_no,
         bd.alternative_no,
@@ -65,11 +104,13 @@
         #{quoteNo} as quote_no,
         #{id} as quote_detail_id,
         #{itemNo} as quote_detail_item_no,
-        #{versionNo} as version_no
+        #{versionNo} as version_no,
+        2 as priority
         from plm_bom_detail bd
         left join plm_bom_header bh
         on bd.site = bh.site and bd.part_no = bh.part_no and bd.bu_no = bh.bu_no
         and bd.bom_type = bh.bom_type and bd.eng_chg_level = bh.eng_chg_level
+        left join plm_quickly_bom_Info pqbi on bd.site = pqbi.site and bd.part_no = pqbi.part_no and bd.eng_chg_level = pqbi.eng_chg_level
         where bd.site = #{site}
         and bd.part_no = #{partNo}
         and bd.status != 'Tentative'
@@ -82,10 +123,12 @@
         <if test="alternativeNo != null and alternativeNo != ''">
             and bd.alternative_no = #{alternativeNo}
         </if>
-        <if test="alternativeNo  == null or alternativeNo  == ''">
+        <if test="alternativeNo == null or alternativeNo == ''">
             and bd.alternative_no = '*'
         </if>
         order by bh.eff_phase_in_date desc,bh.create_date desc
+        ) combined_result
+        order by priority
     </select>
 
     <select id="queryBomComponentPart" resultType="com.xujie.sys.modules.quote.entity.QuoteDetailBom">
@@ -119,7 +162,6 @@
                #{versionNo}                                    as version_no,
                1 as attrition_rate
         from plm_bom_component pbc
-        inner join plm_quickly_bom_Info pqbi on pbc.site = pqbi.site and pbc.part_no = pqbi.part_no and pqbi.eng_chg_level = pbc.eng_chg_level
         where pbc.site = #{site}
           and pbc.part_no = #{partNo}
           and pbc.bom_type = #{bomType}
@@ -164,6 +206,43 @@
     </select>
 
     <select id="queryPartBomRouting" resultType="com.xujie.sys.modules.quote.entity.QuoteDetailRouting">
+        select top 1 * from (
+        select top 1
+        rd.site,
+        #{buNo} as bu_no,
+        rd.routing_revision,
+        rd.routing_type,
+        rd.part_no,
+        rd.alternative_no,
+        #{quoteId} as quote_id,
+        #{quoteNo} as quote_no,
+        #{id} as quote_detail_id,
+        #{itemNo} as quote_detail_item_no,
+        #{versionNo} as version_no,
+        1 as priority
+        from plm_routing_detail rd
+        left join plm_routing_header rh
+        on rd.site = rh.site and rd.bu_no = rh.bu_no and rd.part_no = rh.part_no and
+        rd.routing_type = rh.routing_type and rd.routing_revision = rh.routing_revision
+        inner join plm_quickly_bom_Info qbi on rd.site = qbi.site and rd.part_no = qbi.part_no and rd.routing_revision = qbi.routing_revision
+        where rd.site = #{site}
+        and rd.part_no = #{partNo}
+        <if test="engChgLevel == null">
+            and rh.phase_out_date is null
+        </if>
+        <if test="engChgLevel != null">
+            and rh.routing_revision = #{engChgLevel}
+        </if>
+        <if test="alternativeNo != null and alternativeNo != ''">
+            and rd.alternative_no = #{alternativeNo}
+        </if>
+        <if test="alternativeNo == null or alternativeNo == ''">
+            and rd.alternative_no = '*'
+        </if>
+        order by rh.phase_in_date desc,rh.create_date desc
+
+        union all
+
         select top 1
         rd.site,
         #{buNo} as bu_no,
@@ -175,12 +254,12 @@
         #{quoteNo} as quote_no,
         #{id} as quote_detail_id,
         #{itemNo} as quote_detail_item_no,
-        #{versionNo} as version_no
+        #{versionNo} as version_no,
+        2 as priority
         from plm_routing_detail rd
         left join plm_routing_header rh
         on rd.site = rh.site and rd.bu_no = rh.bu_no and rd.part_no = rh.part_no and
-        rd.routing_type = rh.routing_type and
-        rd.routing_revision = rh.routing_revision
+        rd.routing_type = rh.routing_type and rd.routing_revision = rh.routing_revision
         left join plm_quickly_bom_Info qbi on rd.site = qbi.site and rd.part_no = qbi.part_no and rd.routing_revision = qbi.routing_revision
         where rd.site = #{site}
         and rd.part_no = #{partNo}
@@ -193,10 +272,12 @@
         <if test="alternativeNo != null and alternativeNo != ''">
             and rd.alternative_no = #{alternativeNo}
         </if>
-        <if test="alternativeNo  == null or alternativeNo  == ''">
+        <if test="alternativeNo == null or alternativeNo == ''">
             and rd.alternative_no = '*'
         </if>
         order by rh.phase_in_date desc,rh.create_date desc
+        ) combined_result
+        order by priority
     </select>
 
     <select id="queryYieldRate" resultType="java.math.BigDecimal">