diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 4d2d350a..832ba360 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -66,9 +66,9 @@
         dbo.get_family_name(a.site, a.sourceBu, a.FamilyID) as familyName,
         isnull(b.yield_rate, 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
+        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 b.type = '2'
+            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)
             <if test = "query.partNo != null and query.partNo != ''">
                 AND a.part_no like '%' + #{query.partNo} + '%'
@@ -95,9 +95,9 @@
         dbo.get_family_name(a.site, a.sourceBu, a.FamilyID) as familyName,
         isnull(b.yield_rate, 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
+        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 b.type = '2'
+            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)
             <if test = "query.partNo != null and query.partNo != ''">
                 AND a.part_no like '%' + #{query.partNo} + '%'