diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 9a701de61..4081c7dcf 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -784,7 +784,7 @@ - a.del_flag='0' and order_status !='0' + a.del_flag='0' and a.order_status !='0' and a.order_status!='2' and ( FIND_IN_SET( a.`bill_code`,#{billCode}) or a.bill_code like concat('%', #{billCode}, '%') ) and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode} and a.send_site_code= #{sendSiteCode} @@ -1648,7 +1648,7 @@ payment_remark, order_remark, data_from, bl_special_goods, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site,ext_info from emis_waybill a - where a.del_flag='0' and a.bl_bill = '0' limit 300 + where a.del_flag='0' and a.bl_bill = '0' and a.order_status !='0' and a.order_status!='2' limit 300