|
|
@ -627,6 +627,9 @@ |
|
|
<if test="query.endDate2 != null"> |
|
|
<if test="query.endDate2 != null"> |
|
|
AND #{query.endDate2} >= a.task_date |
|
|
AND #{query.endDate2} >= a.task_date |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test = "query.spec != null and query.spec != ''"> |
|
|
|
|
|
AND d.spec LIKE '%' + #{query.spec} + '%' |
|
|
|
|
|
</if> |
|
|
</where> |
|
|
</where> |
|
|
ORDER BY |
|
|
ORDER BY |
|
|
CASE WHEN a.state = '未开始' THEN 1 |
|
|
CASE WHEN a.state = '未开始' THEN 1 |
|
|
@ -1024,6 +1027,9 @@ |
|
|
<if test = "query.invdefinetype != null and query.invdefinetype != ''"> |
|
|
<if test = "query.invdefinetype != null and query.invdefinetype != ''"> |
|
|
AND d.PartType LIKE '%' + #{query.invdefinetype} + '%' |
|
|
AND d.PartType LIKE '%' + #{query.invdefinetype} + '%' |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test = "query.spec != null and query.spec != ''"> |
|
|
|
|
|
AND d.spec LIKE '%' + #{query.spec} + '%' |
|
|
|
|
|
</if> |
|
|
</where> |
|
|
</where> |
|
|
ORDER BY |
|
|
ORDER BY |
|
|
CASE WHEN a.state = '待检验' THEN 1 |
|
|
CASE WHEN a.state = '待检验' THEN 1 |
|
|
@ -1385,6 +1391,9 @@ |
|
|
<if test="query.endDate2 != null"> |
|
|
<if test="query.endDate2 != null"> |
|
|
AND #{query.endDate2} >= a.task_date |
|
|
AND #{query.endDate2} >= a.task_date |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test = "query.spec != null and query.spec != ''"> |
|
|
|
|
|
AND d.spec LIKE '%' + #{query.spec} + '%' |
|
|
|
|
|
</if> |
|
|
</where> |
|
|
</where> |
|
|
ORDER BY |
|
|
ORDER BY |
|
|
CASE WHEN a.state = '待检验' THEN 1 |
|
|
CASE WHEN a.state = '待检验' THEN 1 |
|
|
@ -3425,6 +3434,12 @@ |
|
|
<if test = "query.customerName != null and query.customerName != ''"> |
|
|
<if test = "query.customerName != null and query.customerName != ''"> |
|
|
AND dbo.Get_CustomerDesc(a.site, a.customer_no) LIKE '%' + #{query.customerName} + '%' |
|
|
AND dbo.Get_CustomerDesc(a.site, a.customer_no) LIKE '%' + #{query.customerName} + '%' |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test = "query.poOrderNo != null and query.poOrderNo != ''"> |
|
|
|
|
|
AND a.po_orderNo LIKE '%' + #{query.poOrderNo} + '%' |
|
|
|
|
|
</if> |
|
|
|
|
|
<if test = "query.spec != null and query.spec != ''"> |
|
|
|
|
|
AND d.spec LIKE '%' + #{query.spec} + '%' |
|
|
|
|
|
</if> |
|
|
</where> |
|
|
</where> |
|
|
ORDER BY |
|
|
ORDER BY |
|
|
CASE WHEN a.state = '待检验' THEN 1 |
|
|
CASE WHEN a.state = '待检验' THEN 1 |
|
|
|