diff --git a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java index d97d7be2..a54934f2 100644 --- a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java +++ b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java @@ -22,6 +22,7 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader { private String userName; private String menuId; private String orderRef1; + private String orderRef2; private String bu; private String departmentDesc; diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml index 15f1e33c..aca50bc1 100644 --- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml +++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml @@ -257,6 +257,9 @@ AND a.orderRef1 = #{orderRef1} + + AND a.orderRef2 = #{orderRef2} + order by a.apply_no, a.seqNo diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml index bcf12137..85c05343 100644 --- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml +++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml @@ -322,7 +322,7 @@ and q.project_no = #{projectNo} - and qd.part_no = #{partNo} or pp.ifs_part_no = #{partNo} + and pp.plm_part_no = #{partNo} order by qd.part_no diff --git a/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml b/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml index a85d4760..6e23d2dd 100644 --- a/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml +++ b/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml @@ -316,7 +316,7 @@ and q.project_no = #{projectNo} - and qd.part_no = #{partNo} or pp.ifs_part_no = #{partNo} + and pp.plm_part_no = #{partNo} order by qd.part_no