diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml index 64322c20..911e8314 100644 --- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml @@ -58,7 +58,9 @@ pcpi.customer_part_no, dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.proofing_no) as approvalUsername, vpp.plm_part_no, - a.proofing_amount + a.proofing_amount, + tss.ori_code_no, + tss.stage FROM plm_proofing_information as a left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId} left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and @@ -68,6 +70,19 @@ left join BU b on vpp.bu_no = b.bu_no and a.site = b.site left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no + LEFT JOIN ( + SELECT tss1.* + FROM plm_technical_specification_sheet tss1 + INNER JOIN ( + SELECT site, test_part_no, MAX(rev_no) AS max_rev + FROM plm_technical_specification_sheet + WHERE status = '未升版' + GROUP BY site, test_part_no + ) tss_max ON tss1.site = tss_max.site + AND tss1.test_part_no = tss_max.test_part_no + AND tss1.rev_no = tss_max.max_rev + WHERE tss1.status = '未升版' + ) tss ON a.site = tss.site AND a.test_part_no = tss.test_part_no a.site = #{query.site}