diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml index 4df095fd..b169a814 100644 --- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -599,8 +599,7 @@ pcpi.customer_part_no FROM view_Project_Part as ppp LEFT JOIN plm_project_info as ppi on ppp.site = ppi.site and ppp.project_id = ppi.project_id - left join plm_customer_part_info pcpi on ppp.site = pcpi.site and ppp.test_part_no = pcpi.part_no and - ppi.customer_id = pcpi.customer_no + left join plm_customer_part_info pcpi on ppp.site = pcpi.site and ppp.test_part_no = pcpi.part_no and ppi.customer_id = pcpi.customer_no ppp.site = #{params.site} diff --git a/src/main/resources/mapper/quote/QuoteDetailToolMapper.xml b/src/main/resources/mapper/quote/QuoteDetailToolMapper.xml index 1b3bb878..bfca7952 100644 --- a/src/main/resources/mapper/quote/QuoteDetailToolMapper.xml +++ b/src/main/resources/mapper/quote/QuoteDetailToolMapper.xml @@ -85,7 +85,7 @@ th.tool_description, rt.tool_qty, '', - th.standard_cost, + isnull(th.standard_cost,0), 0, case when rt.tool_qty = 0 then 0 else th.standard_cost / rt.tool_qty end, null,