diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 3b1946664..2c34fbbb7 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1180,9 +1180,6 @@ and a.update_site=#{updateSite} - - and a.waybill_status='0' and a.order_status='0' - and a.bill_code in ( @@ -1197,12 +1194,17 @@ + + and a.waybill_status='0' and a.order_status='0' + + + and a.waybill_status!='0' and a.order_status!='2' - and a.waybill_status!='0' and a.order_status='2' + and a.order_status='2'