diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index c87072bbb..9d8fa7588 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -494,7 +494,7 @@ - a.del_flag='0' and a.order_status !='0' and a.order_status!='2' + a.del_flag='0' and a.order_status !='0' and a.id = #{id} and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) @@ -1202,11 +1202,11 @@ - and a.waybill_status!='0' + and a.waybill_status!='0' and a.order_status='2' - + and a.order_status='3' @@ -1961,7 +1961,6 @@ from emis_waybill a where a.del_flag='0' and a.waybill_status!='0' - and a.order_status!='0' and a.order_status!='3' and ( a.send_site_code in ( @@ -1982,8 +1981,7 @@ select count(1) as hasCancelCount from emis_waybill a where a.del_flag='0' - and a.waybill_status!='0' - and a.order_status!='0' and a.order_status!='3' + and a.order_status='2' and ( a.send_site_code in (