Browse Source

2025-04-22

master
qiezi 9 months ago
parent
commit
d153b20b47
  1. 1
      src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
  2. 3
      src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
  3. 2
      src/main/resources/mapper/quote/QuoteDetailMapper.xml
  4. 2
      src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml

1
src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java

@ -22,6 +22,7 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader {
private String userName; private String userName;
private String menuId; private String menuId;
private String orderRef1; private String orderRef1;
private String orderRef2;
private String bu; private String bu;
private String departmentDesc; private String departmentDesc;

3
src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml

@ -257,6 +257,9 @@
<if test="orderRef1 != null and orderRef1 != ''"> <if test="orderRef1 != null and orderRef1 != ''">
AND a.orderRef1 = #{orderRef1} AND a.orderRef1 = #{orderRef1}
</if> </if>
<if test="orderRef2 != null and orderRef2 != ''">
AND a.orderRef2 = #{orderRef2}
</if>
</where> </where>
order by a.apply_no, a.seqNo order by a.apply_no, a.seqNo
</select> </select>

2
src/main/resources/mapper/quote/QuoteDetailMapper.xml

@ -322,7 +322,7 @@
and q.project_no = #{projectNo} and q.project_no = #{projectNo}
</if> </if>
<if test="partNo != null and partNo != ''"> <if test="partNo != null and partNo != ''">
and qd.part_no = #{partNo} or pp.ifs_part_no = #{partNo}
and pp.plm_part_no = #{partNo}
</if> </if>
</where> </where>
order by qd.part_no order by qd.part_no

2
src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml

@ -316,7 +316,7 @@
and q.project_no = #{projectNo} and q.project_no = #{projectNo}
</if> </if>
<if test="partNo != null and partNo != ''"> <if test="partNo != null and partNo != ''">
and qd.part_no = #{partNo} or pp.ifs_part_no = #{partNo}
and pp.plm_part_no = #{partNo}
</if> </if>
</where> </where>
order by qd.part_no order by qd.part_no

Loading…
Cancel
Save