This commit is contained in:
linfso 2024-09-02 10:34:52 +08:00
parent 8020e2fce2
commit b16f486f23

View File

@ -460,32 +460,6 @@
<if test="userId != null "> and a.user_id = #{userId}</if>
<if test="params.waybillStatType != null and params.waybillStatType == 1">
and a.waybill_status='0' and a.order_status='0'
</if>
<if test="params.waybillStatType != null and params.waybillStatType == 2">
and a.waybill_status!='0' and a.order_status='1'
</if>
<if test="params.waybillStatType != null and params.waybillStatType == 3">
and a.waybill_status!='0'
</if>
<if test="params.waybillStatType != null and params.waybillStatType == 4">
</if>
<if test="blSign != null and blSign == 1">
and a.bl_sign='1'
</if>
<if test="blSign != null and blSign!='' and blSign == 0">
and a.bl_sign!='1'
</if>
<!-- 寄件 -->
<if test="params.omsOrderTab == null or (params.omsOrderTab != null and params.omsOrderTab != 2) ">
and a.customer_code=#{customerCode}
@ -501,10 +475,6 @@
and a.payment_status='0'
</if>
and not exists(
select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and ewpi.`problem_type` !=null and ewpi.`problem_type` in(173,170,151)
)
@ -516,7 +486,6 @@
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
<if test="params.beginSendDate != null and params.beginSendDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginSendDate}
</if>