|
|
|
@ -215,6 +215,7 @@ |
|
|
|
<if test="q.cardNo != null and q.cardNo != ''"> |
|
|
|
<if test="q.cardNo != null and q.cardNo != ''"> |
|
|
|
AND wo.CARD_NO = #{q.cardNo} |
|
|
|
AND wo.CARD_NO = #{q.cardNo} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
|
|
|
|
|
|
|
|
<if test="q.woCode != null"> |
|
|
|
<if test="q.woCode != null"> |
|
|
|
AND wo.WO_ID = #{q.woCode} |
|
|
|
AND wo.WO_ID = #{q.woCode} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
@ -232,9 +233,7 @@ |
|
|
|
AND yo.PRODUCT_IDENT = #{q.prodIdent} |
|
|
|
AND yo.PRODUCT_IDENT = #{q.prodIdent} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
|
|
|
|
|
|
|
|
<if test="q.cardNo != null and q.cardNo != ''"> |
|
|
|
|
|
|
|
AND wo.CARD_NO = #{q.cardNo} |
|
|
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
-- ps |
|
|
|
-- ps |
|
|
|
<if test="q.currentProcessId != null"> |
|
|
|
<if test="q.currentProcessId != null"> |
|
|
|
AND ps.ID = #{q.currentProcessId} |
|
|
|
AND ps.ID = #{q.currentProcessId} |
|
|
|
|