aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-30 16:15:39 +08:00
parent 660cbcc000
commit e72095967c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -494,7 +494,7 @@
<select id="selectWaitGotOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult"> <select id="selectWaitGotOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
<include refid="selectEmisWaybillVo"/> <include refid="selectEmisWaybillVo"/>
<where> <where>
a.del_flag='0' and a.order_type='0' and a.waybill_status='0' and a.order_status in('0','2') a.del_flag='0' and a.order_type='0' and a.waybill_status='0' and a.order_status in('0','3')
<if test="id != null "> and a.id = #{id}</if> <if test="id != null "> and a.id = #{id}</if>
<if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if> <if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
@ -1018,7 +1018,7 @@
<select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult"> <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
<include refid="selectEmisWaybillVo"/> <include refid="selectEmisWaybillVo"/>
<where> <where>
a.del_flag='0' and a.order_status !='0' and a.order_status!='2' a.del_flag='0' and a.order_status !='0'
<if test="id != null "> and a.id = #{id}</if> <if test="id != null "> and a.id = #{id}</if>
<if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if> <if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
@ -1202,11 +1202,11 @@
</if> </if>
<if test="params.waybillStatType != null and params.waybillStatType == 3"> <if test="params.waybillStatType != null and params.waybillStatType == 3">
and a.waybill_status!='0' and a.waybill_status!='0' and a.order_status='2'
</if> </if>
<if test="params.waybillStatType != null and params.waybillStatType == 4"> <if test="params.waybillStatType != null and params.waybillStatType == 4">
and a.order_status='3'
</if> </if>
@ -1961,7 +1961,6 @@
from emis_waybill a from emis_waybill a
where a.del_flag='0' where a.del_flag='0'
and a.waybill_status!='0' and a.waybill_status!='0'
and a.order_status!='0' and a.order_status!='3'
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and ( and (
a.send_site_code in ( a.send_site_code in (
@ -1982,8 +1981,7 @@
select count(1) as hasCancelCount select count(1) as hasCancelCount
from emis_waybill a from emis_waybill a
where a.del_flag='0' where a.del_flag='0'
and a.waybill_status!='0' and a.order_status='2'
and a.order_status!='0' and a.order_status!='3'
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and ( and (
a.send_site_code in ( a.send_site_code in (