Browse Source

2024-07-05

功能优化
master
fengyuan_yang 2 years ago
parent
commit
11a8b077ec
  1. 9
      src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
  2. 37
      src/main/resources/mapper/pms/QcMapper.xml

9
src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java

@ -255,6 +255,7 @@ public class QcFAIRecordData extends QueryPage {
private String refInfo2; private String refInfo2;
private String refInfo3; private String refInfo3;
private String refInfo4; private String refInfo4;
private String refInfo5;
private String orderRef1; private String orderRef1;
private String orderRef2; private String orderRef2;
private String orderRef3; private String orderRef3;
@ -263,6 +264,14 @@ public class QcFAIRecordData extends QueryPage {
private String warehouseId; private String warehouseId;
private String warehouseName; private String warehouseName;
public String getRefInfo5() {
return refInfo5;
}
public void setRefInfo5(String refInfo5) {
this.refInfo5 = refInfo5;
}
public String getWarehouseId() { public String getWarehouseId() {
return warehouseId; return warehouseId;
} }

37
src/main/resources/mapper/pms/QcMapper.xml

@ -2263,6 +2263,7 @@
ref_info2, ref_info2,
ref_info3, ref_info3,
ref_info4, ref_info4,
ref_info5,
warehouse_id, warehouse_id,
dbo.Get_WareHouseDesc(site, warehouse_id) as warehouseName dbo.Get_WareHouseDesc(site, warehouse_id) as warehouseName
FROM qc_iqc_record FROM qc_iqc_record
@ -2323,6 +2324,27 @@
<if test = "query.warehouseName != null and query.warehouseName != ''"> <if test = "query.warehouseName != null and query.warehouseName != ''">
AND dbo.Get_WareHouseDesc(site, warehouse_id) LIKE '%' + #{query.warehouseName} + '%' AND dbo.Get_WareHouseDesc(site, warehouse_id) LIKE '%' + #{query.warehouseName} + '%'
</if> </if>
<if test = "query.receiptNo != null and query.receiptNo != ''">
AND receipt_no LIKE '%' + #{query.receiptNo} + '%'
</if>
<if test = "query.receiptItemNo != null and query.receiptItemNo != ''">
AND receipt_item_no = #{query.receiptItemNo}
</if>
<if test = "query.refInfo1 != null and query.refInfo1 != ''">
AND ref_info1 LIKE '%' + #{query.refInfo1} + '%'
</if>
<if test = "query.refInfo2 != null and query.refInfo2 != ''">
AND ref_info2 LIKE '%' + #{query.refInfo2} + '%'
</if>
<if test = "query.refInfo3 != null and query.refInfo3 != ''">
AND ref_info3 LIKE '%' + #{query.refInfo3} + '%'
</if>
<if test = "query.refInfo4 != null and query.refInfo4 != ''">
AND ref_info4 LIKE '%' + #{query.refInfo4} + '%'
</if>
<if test = "query.refInfo5 != null and query.refInfo5 != ''">
AND ref_info5 LIKE '%' + #{query.refInfo5} + '%'
</if>
</where> </where>
ORDER BY ORDER BY
CASE WHEN state = '待检验' THEN 1 CASE WHEN state = '待检验' THEN 1
@ -3590,6 +3612,21 @@
<if test="query.endDate2 != null"> <if test="query.endDate2 != null">
AND #{query.endDate2} >= create_date AND #{query.endDate2} >= create_date
</if> </if>
<if test = "query.orderRef1 != null and query.orderRef1 != ''">
AND order_ref1 LIKE '%' + #{query.orderRef1} + '%'
</if>
<if test = "query.orderRef2 != null and query.orderRef2 != ''">
AND order_ref2 LIKE '%' + #{query.orderRef2} + '%'
</if>
<if test = "query.orderRef3 != null and query.orderRef3 != ''">
AND order_ref3 LIKE '%' + #{query.orderRef3} + '%'
</if>
<if test = "query.orderRef4 != null and query.orderRef4 != ''">
AND order_ref4 LIKE '%' + #{query.orderRef4} + '%'
</if>
<if test = "query.orderRef5 != null and query.orderRef5 != ''">
AND order_ref5 LIKE '%' + #{query.orderRef5} + '%'
</if>
</where> </where>
ORDER BY ORDER BY
CASE WHEN state = '待检验' THEN 1 CASE WHEN state = '待检验' THEN 1

Loading…
Cancel
Save