Commit d03dff3c9dee964cfcad4824f3e0100f6a98ed17

Authored by yeqianyong
2 parents bdfa7841 db5f2499

Merge remote-tracking branch 'origin/master_0929' into master_0929

... ... @@ -179,7 +179,8 @@
179 179 AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
180 180 tb.revoke_status='PARTIAL')
181 181 AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
182   - AND tb.type ='PRODUCTION'
  182 + AND tb.examine_status = 'PASS'
  183 + AND tb.spec_change_status != 'IN_PROGRESS'
183 184 </when>
184 185 <when test="vo.queryType == 'CHANGE'">
185 186 AND tb.examine_status = 'PASS'
... ...