diff --git a/pom.xml b/pom.xml
index da967ddf..cc1ed732 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>aspose</groupId>
             <artifactId>words</artifactId>
-            <version>15.8.0</version>
+            <version>16.8.0</version>
             <scope>system</scope>
             <systemPath>${project.basedir}/jar/aspose-words-16.8.0.jar</systemPath>
         </dependency>
diff --git a/src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java b/src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java
index a67d6eb3..fface927 100644
--- a/src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java
+++ b/src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java
@@ -43,4 +43,6 @@ public class BomHeaderVo extends BomHeaderEntity {
     private String alternativeNo;
 
     private BigDecimal yieldRate;
+
+    private String status;
 }
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 832ba360..4f9ff5c3 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -24,14 +24,14 @@
             a.update_by,
             b.umid2 as printUnit,
             dbo.qc_get_um_name(a.site, b.umid2) as printUnitName,
-            isnull(c.yield_rate, 100) as yieldRate
+            isnull(dbo.get_yield_rate(a.site, a.bu_no, b.product_group_id2, '2'), 100) as yieldRate
         FROM plm_bom_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 part_product_group as c on b.site = c.site and b.sourceBu = c.bu_no and b.product_group_id2 = c.product_group_id
+        left join plm_bom_detail as d on a.site = d.site and a.bu_no = d.bu_no and a.part_no = d.part_no and a.eng_chg_level = d.eng_chg_level and a.bom_type = d.bom_type
         <where>
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
-            and c.type = '2'
+            and d.alternative_no = '*'
             <if test="query.buNo != null and query.buNo != ''">
                 AND a.bu_no = #{query.buNo}
             </if>
@@ -41,12 +41,15 @@
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND dbo.qc_get_part_desc(a.site, a.bu_no, a.part_no) like '%' + #{query.partDesc} + '%'
             </if>
-              <if test = "query.bomType != null and query.bomType != ''">
+            <if test = "query.bomType != null and query.bomType != ''">
                 AND a.bom_type = #{query.bomType}
             </if>
-              <if test = "query.engChgLevel != null and query.engChgLevel != ''">
+            <if test = "query.engChgLevel != null and query.engChgLevel != ''">
                 AND a.eng_chg_level = #{query.engChgLevel}
             </if>
+            <if test = "query.status != null and query.status != ''">
+                AND d.status = #{query.status}
+            </if>
         </where>
     </select>
 
@@ -64,9 +67,8 @@
         case when a.part_type2 = 'Manufactured' then '成品' when a.part_type2 = 'Manufactured Recipe' then '半成品' when a.part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc,
         a.FamilyID,
         dbo.get_family_name(a.site, a.sourceBu, a.FamilyID) as familyName,
-        isnull(b.yield_rate, 100) as yieldRate
+        isnull(dbo.get_yield_rate(a.site, a.sourceBu, a.product_group_id2, '2'), 100) as yieldRate
         FROM part as a
-        left join part_product_group as b on a.site = b.site and a.sourceBu = b.bu_no and a.product_group_id2 = b.product_group_id and b.type = '2'
         <where>
             a.site = #{query.site} and a.sourceBu = #{query.buNo} and a.active = 'Y'
             and (a.part_type2 <![CDATA[<>]]> 'Purchased (raw)' or a.part_type2 is null)
@@ -93,9 +95,8 @@
         case when a.part_type2 = 'Manufactured' then '成品' when a.part_type2 = 'Manufactured Recipe' then '半成品' when a.part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc,
         a.FamilyID,
         dbo.get_family_name(a.site, a.sourceBu, a.FamilyID) as familyName,
-        isnull(b.yield_rate, 100) as yieldRate
+        isnull(dbo.get_yield_rate(a.site, a.sourceBu, a.product_group_id2, '2'), 100) as yieldRate
         FROM part as a
-        left join part_product_group as b on a.site = b.site and a.sourceBu = b.bu_no and a.product_group_id2 = b.product_group_id and b.type = '2'
         <where>
             a.site = #{query.site} and a.sourceBu = #{query.buNo} and a.active = 'Y'
             and (a.part_type2 <![CDATA[<>]]> 'Purchased (raw)' or a.part_type2 is null)
@@ -309,11 +310,10 @@
             a.type_flag,
             a.net_weight,
             a.note_text,
-            isnull(c.yield_rate, 0) as yieldRate
+            isnull(dbo.get_yield_rate(b.site, b.sourceBu, b.product_group_id2, '2'), 100) as yieldRate
         FROM plm_bom_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 part_product_group as c on b.site = c.site and b.sourceBu = c.bu_no and b.product_group_id2 = c.product_group_id
-        where a.site = #{site} and a.bu_no = #{buNo} and a.part_no = #{partNo} and a.bom_type = #{bomType} and a.eng_chg_level = #{engChgLevel} and c.type = '2'
+        where a.site = #{site} and a.bu_no = #{buNo} and a.part_no = #{partNo} and a.bom_type = #{bomType} and a.eng_chg_level = #{engChgLevel}
     </select>
 
     <!-- bom明细查重 -->
@@ -667,18 +667,16 @@
         a.update_by,
         b.umid2 as printUnit,
         dbo.qc_get_um_name(a.site, b.umid2) as printUnitName,
-        isnull(c.yield_rate, 100) as yieldRate,
+        isnull(dbo.get_yield_rate(b.site, b.sourceBu, b.product_group_id2, '2'), 100) as yieldRate
         #{alternativeNo} as alternativeNo
         FROM plm_bom_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 part_product_group as c on b.site = c.site and b.sourceBu = c.bu_no and b.product_group_id2 = c.product_group_id
         <where>
             a.site = #{site}
             and a.bu_no = #{buNo}
             AND a.part_no = #{partNo}
             AND a.bom_type = #{bomType}
             AND a.eng_chg_level = #{engChgLevel}
-            and c.type = '2'
         </where>
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml b/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
index 3b78e452..3c0dfa83 100644
--- a/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
+++ b/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
@@ -12,9 +12,9 @@
                A.operation_no,
                B.operation_name,
                B.work_center_no,
-               dbo.get_workCenter_desc(A.site, A.bu_no, B.work_center_no) as work_center_desc,
+               dbo.get_workCenter_desc(A.site, B.work_center_no) as work_center_desc,
                B.labor_class_no,
-               dbo.get_labor_class_desc(A.site, A.bu_no, B.labor_class_no) as labor_class_desc,
+               dbo.get_labor_class_desc(A.site, B.labor_class_no) as labor_class_desc,
                A.create_date,
                A.create_by,
                B.update_date,
@@ -23,7 +23,7 @@
                B.setup_crew_size,
                B.crew_size,
                A.operation_id,
-               dbo.get_labor_class_desc(A.site, A.bu_no, B.setup_labor_class_no) as setup_labor_class_desc
+               dbo.get_labor_class_desc(A.site, B.setup_labor_class_no) as setup_labor_class_desc
         from part_group_std_operations A
         left join standard_routing_operation B on A.operation_id = B.id
            <where>
diff --git a/src/main/resources/mapper/part/PtmConditionProcessMapper.xml b/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
index 91033d32..232f97f2 100644
--- a/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
+++ b/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
@@ -21,9 +21,9 @@
                 b.operation_no,
                c.operation_name,
                c.work_center_no,
-               dbo.get_workcenter_desc(b.site, b.bu_no, c.work_center_no) as work_center_desc,
+               dbo.get_workcenter_desc(b.site, c.work_center_no) as work_center_desc,
                c.labor_class_no,
-               dbo.get_labor_class_desc(b.site, b.bu_no, c.labor_class_no) as labor_class_desc,
+               dbo.get_labor_class_desc(b.site, c.labor_class_no) as labor_class_desc,
                b.create_date,
                b.create_by,
                a.update_date,
@@ -32,7 +32,7 @@
                c.crew_size,
                c.setup_crew_size,
                b.operation_id,
-               dbo.get_labor_class_desc(b.site, b.bu_no, c.setup_labor_class_no) as setup_labor_class_desc
+               dbo.get_labor_class_desc(b.site, c.setup_labor_class_no) as setup_labor_class_desc
         from ptm_condition_process as a
                  left join part_group_std_operations as b on a.part_group_std_operations_id = b.id
                  left join standard_routing_operation c on b.operation_id = c.id
diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml
index 12d0ed72..94eb4ceb 100644
--- a/src/main/resources/mapper/part/RoutingManagementMapper.xml
+++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml
@@ -202,9 +202,9 @@
             b.work_center_desc,
             b.work_center_type,
             a.labor_class_no,
-            dbo.get_labor_class_desc(a.site, a.bu_no, a.labor_class_no) as laborClassDesc,
+            dbo.get_labor_class_desc(a.site, a.labor_class_no) as laborClassDesc,
             a.setup_labor_class_no,
-            dbo.get_labor_class_desc(a.site, a.bu_no, a.setup_labor_class_no) as setupLaborClassDesc,
+            dbo.get_labor_class_desc(a.site, a.setup_labor_class_no) as setupLaborClassDesc,
             a.overlap,
             a.note_text,
             a.mach_cycle_time,
@@ -575,11 +575,11 @@
             b.operation_no,
             b.operation_name,
             b.work_center_no,
-            dbo.get_workCenter_desc(a.site, a.bu_no, b.work_center_no) as workCenterDesc,
+            dbo.get_workCenter_desc(a.site, b.work_center_no) as workCenterDesc,
             b.labor_class_no,
-            dbo.get_labor_class_desc(a.site, a.bu_no, b.labor_class_no) as laborClassDesc,
+            dbo.get_labor_class_desc(a.site, b.labor_class_no) as laborClassDesc,
             b.setup_labor_class_no,
-            dbo.get_labor_class_desc(a.site, a.bu_no, b.setup_labor_class_no) as setupLaborClassDesc,
+            dbo.get_labor_class_desc(a.site, b.setup_labor_class_no) as setupLaborClassDesc,
             'Units/Hour' as runTimeCode,
             100 as efficiencyFactor,
             crew_size,
diff --git a/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml b/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
index 3c551df9..d779de39 100644
--- a/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
@@ -14,9 +14,9 @@
             operation_no,
             operation_name,
             work_center_no,
-            dbo.get_workCenter_desc(site,bu_no, work_center_no) as work_center_desc,
+            dbo.get_workCenter_desc(site, work_center_no) as work_center_desc,
             labor_class_no,
-            dbo.get_labor_class_desc(site,bu_no, labor_class_no) as labor_class_desc,
+            dbo.get_labor_class_desc(site, labor_class_no) as labor_class_desc,
             create_date,
             create_by,
             update_date,
@@ -24,7 +24,7 @@
             setup_labor_class_no,
             setup_crew_size,
             crew_size,
-            dbo.get_labor_class_desc(site,bu_no, setup_labor_class_no) as setup_labor_class_desc,
+            dbo.get_labor_class_desc(site, setup_labor_class_no) as setup_labor_class_desc,
             ref_daily_production,
             ref_speed,
             ref_time,