This commit is contained in:
linfso 2024-12-29 14:10:31 +08:00
parent 78d80829df
commit d0fa45146c

View File

@ -86,14 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and confirm_status= '2' and confirm_status= '2'
</if> </if>
<if test="params.searchValue != null and params.searchValue !='' "> <if test="searchValue != null and searchValue !='' ">
and ( and (
a.in_no like concat('%', #{params.searchValue}, '%') a.in_no like concat('%', #{searchValue}, '%')
or a.bill_code like concat('%', #{params.searchValue}, '%') or a.bill_code like concat('%', #{searchValue}, '%')
or a.order_sn like concat('%', #{params.searchValue}, '%') or a.order_sn like concat('%', #{searchValue}, '%')
or exists ( or exists (
select 1 from emis_waybill ew where a.bill_code=ew.bill_code and ( select 1 from emis_waybill ew where a.bill_code=ew.bill_code and (
ew.receive_name like concat('%', #{params.searchValue}, '%') or ew.receive_mobile like concat('%', #{params.searchValue}, '%') ew.receive_name like concat('%', #{searchValue}, '%') or ew.receive_mobile like concat('%', #{searchValue}, '%')
) )
) )
) )
@ -165,14 +165,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and confirm_status= '2' and confirm_status= '2'
</if> </if>
<if test="params.searchValue != null and params.searchValue !='' "> <if test="searchValue != null and searchValue !='' ">
and ( and (
a.in_no like concat('%', #{params.searchValue}, '%') a.in_no like concat('%', #{searchValue}, '%')
or a.bill_code like concat('%', #{params.searchValue}, '%') or a.bill_code like concat('%', #{searchValue}, '%')
or a.order_sn like concat('%', #{params.searchValue}, '%') or a.order_sn like concat('%', #{searchValue}, '%')
or exists ( or exists (
select 1 from emis_waybill ew where a.bill_code=ew.bill_code and ( select 1 from emis_waybill ew where a.bill_code=ew.bill_code and (
ew.receive_name like concat('%', #{params.searchValue}, '%') or ew.receive_mobile like concat('%', #{params.searchValue}, '%') ew.receive_name like concat('%', #{searchValue}, '%') or ew.receive_mobile like concat('%', #{searchValue}, '%')
) )
) )
) )
@ -180,14 +180,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and EXISTS ( and EXISTS (
select 1 from emis_waybill ewb where a.bill_code=ewb.bill_code and ewb.pickup_method in('1','3') and ewb.order_status in ('0','1','3') and ewb.into_warehouse_code=#{params.privSiteCode} select 1 from emis_waybill ewb
where a.bill_code=ewb.bill_code and ewb.pickup_method in('1','3') and ewb.order_status in ('0','1','3')
and ewb.into_warehouse_code=#{params.privSiteCode}
<if test="params.beginPickStartDate != null and params.beginPickStartDate != ''">
and ewb.pick_start_date <![CDATA[ >= ]]> #{params.beginPickStartDate}
</if>
<if test="params.endPickStartDate != null and params.endPickStartDate != ''">
and ewb.pick_start_date <![CDATA[ <= ]]> #{params.endPickStartDate}
</if>
) )
</if> </if>
<if test="params.privSiteCode != null and params.privSiteCode == '88888'"> <if test="params.privSiteCode != null and params.privSiteCode == '88888'">
and EXISTS ( and EXISTS (
select 1 from emis_waybill ewb where a.bill_code=ewb.bill_code and ewb.pickup_method in('1','3') and ewb.order_status in ('0','1','3') select 1 from emis_waybill ewb
) where a.bill_code=ewb.bill_code and ewb.pickup_method in('1','3') and ewb.order_status in ('0','1','3')
<if test="params.beginPickStartDate != null and params.beginPickStartDate != ''">
and ewb.pick_start_date <![CDATA[ >= ]]> #{params.beginPickStartDate}
</if>
<if test="params.endPickStartDate != null and params.endPickStartDate != ''">
and ewb.pick_start_date <![CDATA[ <= ]]> #{params.endPickStartDate}
</if>
)
</if> </if>
<if test="params.beginCreateTime != null and params.beginCreateTime != ''"> <if test="params.beginCreateTime != null and params.beginCreateTime != ''">