diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml
index ca3cc309..c8dd47ec 100644
--- a/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -306,7 +306,7 @@
                      left join part pp on qd.part_no = pp.part_no and qd.site = pp.site
                      where qd.quote_id = q.id
                  ) gd
-        left join plm_project_part ppp on ppp.site = q.site and ppp.project_id = p.project_id and ppp.test_part_no = gd.part_no
+        left join plm_project_part ppp on ppp.site = q.site and ppp.project_id = p.project_id and (PPP.final_part_no = gd.part_no or PPP.test_part_no = gd.part_no)
         <where>
             <include refid="quotePageWhereConditions"/>
         </where>