Commit 0e7ae8f4 authored by 332784038@qq.com's avatar 332784038@qq.com

订单查询bug修复

parent 5cc0f983
...@@ -2106,12 +2106,12 @@ ...@@ -2106,12 +2106,12 @@
</if> </if>
<if test="query.notEqNumberKey != null and query.notEqNumberKey != '' "> <if test="query.notEqNumberKey != null and query.notEqNumberKey != '' ">
AND o.`order_no` != #{query.notEqNumberKey} AND o.`order_no` != #{query.notEqNumberKey}
AND (o.`old_numbers` is null or o.`old_numbers` != '' or o.`old_numbers` != #{query.notEqNumberKey}) AND (o.`old_numbers` is null or o.`old_numbers` = '' or o.`old_numbers` != #{query.notEqNumberKey})
AND (o.`parent_number` is null or o.`parent_number` != '' or o.`parent_number` != #{query.notEqNumberKey}) AND (o.`parent_number` is null or o.`parent_number` = '' or o.`parent_number` != #{query.notEqNumberKey})
AND (o.`marks` is null or o.`marks` != '' or o.`marks` != #{query.notEqNumberKey}) AND (o.`marks` is null or o.`marks` = '' or o.`marks` != #{query.notEqNumberKey})
AND (o.`tidan_no` is null or o.`tidan_no` != '' or o.`tidan_no` != #{query.notEqNumberKey}) AND (o.`tidan_no` is null or o.`tidan_no` = '' or o.`tidan_no` != #{query.notEqNumberKey})
AND (o.`container_number` is null or o.`container_number` != '' or o.`container_number` != #{query.notEqNumberKey}) AND (o.`container_number` is null or o.`container_number` = '' or o.`container_number` != #{query.notEqNumberKey})
AND (o.`no_charge_record` is null or o.`no_charge_record` != '' or o.`no_charge_record` != #{query.notEqNumberKey}) AND (o.`no_charge_record` is null or o.`no_charge_record` = '' or o.`no_charge_record` != #{query.notEqNumberKey})
</if> </if>
<if test="query.prodKey != null and query.prodKey != '' "> <if test="query.prodKey != null and query.prodKey != '' ">
and (o.order_id in( and (o.order_id in(
...@@ -2849,12 +2849,12 @@ ...@@ -2849,12 +2849,12 @@
</if> </if>
<if test="query.notEqNumberKey != null and query.notEqNumberKey != '' "> <if test="query.notEqNumberKey != null and query.notEqNumberKey != '' ">
AND o.`order_no` != #{query.notEqNumberKey} AND o.`order_no` != #{query.notEqNumberKey}
AND (o.`old_numbers` is null or o.`old_numbers` != '' or o.`old_numbers` != #{query.notEqNumberKey}) AND (o.`old_numbers` is null or o.`old_numbers` = '' or o.`old_numbers` != #{query.notEqNumberKey})
AND (o.`parent_number` is null or o.`parent_number` != '' or o.`parent_number` != #{query.notEqNumberKey}) AND (o.`parent_number` is null or o.`parent_number` = '' or o.`parent_number` != #{query.notEqNumberKey})
AND (o.`marks` is null or o.`marks` != '' or o.`marks` != #{query.notEqNumberKey}) AND (o.`marks` is null or o.`marks` = '' or o.`marks` != #{query.notEqNumberKey})
AND (o.`tidan_no` is null or o.`tidan_no` != '' or o.`tidan_no` != #{query.notEqNumberKey}) AND (o.`tidan_no` is null or o.`tidan_no` = '' or o.`tidan_no` != #{query.notEqNumberKey})
AND (o.`container_number` is null or o.`container_number` != '' or o.`container_number` != #{query.notEqNumberKey}) AND (o.`container_number` is null or o.`container_number` = '' or o.`container_number` != #{query.notEqNumberKey})
AND (o.`no_charge_record` is null or o.`no_charge_record` != '' or o.`no_charge_record` != #{query.notEqNumberKey}) AND (o.`no_charge_record` is null or o.`no_charge_record` = '' or o.`no_charge_record` != #{query.notEqNumberKey})
</if> </if>
<if test="query.prodKey != null and query.prodKey != '' "> <if test="query.prodKey != null and query.prodKey != '' ">
and (o.order_id in( and (o.order_id in(
...@@ -3568,12 +3568,12 @@ ...@@ -3568,12 +3568,12 @@
</if> </if>
<if test="query.notEqNumberKey != null and query.notEqNumberKey != '' "> <if test="query.notEqNumberKey != null and query.notEqNumberKey != '' ">
AND o.`order_no` != #{query.notEqNumberKey} AND o.`order_no` != #{query.notEqNumberKey}
AND (o.`old_numbers` is null or o.`old_numbers` != '' or o.`old_numbers` != #{query.notEqNumberKey}) AND (o.`old_numbers` is null or o.`old_numbers` = '' or o.`old_numbers` != #{query.notEqNumberKey})
AND (o.`parent_number` is null or o.`parent_number` != '' or o.`parent_number` != #{query.notEqNumberKey}) AND (o.`parent_number` is null or o.`parent_number` = '' or o.`parent_number` != #{query.notEqNumberKey})
AND (o.`marks` is null or o.`marks` != '' or o.`marks` != #{query.notEqNumberKey}) AND (o.`marks` is null or o.`marks` = '' or o.`marks` != #{query.notEqNumberKey})
AND (o.`tidan_no` is null or o.`tidan_no` != '' or o.`tidan_no` != #{query.notEqNumberKey}) AND (o.`tidan_no` is null or o.`tidan_no` = '' or o.`tidan_no` != #{query.notEqNumberKey})
AND (o.`container_number` is null or o.`container_number` != '' or o.`container_number` != #{query.notEqNumberKey}) AND (o.`container_number` is null or o.`container_number` = '' or o.`container_number` != #{query.notEqNumberKey})
AND (o.`no_charge_record` is null or o.`no_charge_record` != '' or o.`no_charge_record` != #{query.notEqNumberKey}) AND (o.`no_charge_record` is null or o.`no_charge_record` = '' or o.`no_charge_record` != #{query.notEqNumberKey})
</if> </if>
<if test="query.prodKey != null and query.prodKey != '' "> <if test="query.prodKey != null and query.prodKey != '' ">
and (o.order_id in( and (o.order_id in(
...@@ -4845,13 +4845,13 @@ ...@@ -4845,13 +4845,13 @@
</if> </if>
<if test="query.notEqNumberKey != null and query.notEqNumberKey != '' "> <if test="query.notEqNumberKey != null and query.notEqNumberKey != '' ">
AND o.`order_no` != #{query.notEqNumberKey} AND o.`order_no` != #{query.notEqNumberKey}
AND (o.`old_numbers` is null or o.`old_numbers` != '' or o.`old_numbers` != #{query.notEqNumberKey}) AND (o.`old_numbers` is null or o.`old_numbers` = '' or o.`old_numbers` != #{query.notEqNumberKey})
AND (o.`parent_number` is null or o.`parent_number` != '' or o.`parent_number` != #{query.notEqNumberKey}) AND (o.`parent_number` is null or o.`parent_number` = '' or o.`parent_number` != #{query.notEqNumberKey})
AND (o.`marks` is null or o.`marks` != '' or o.`marks` != #{query.notEqNumberKey}) AND (o.`marks` is null or o.`marks` = '' or o.`marks` != #{query.notEqNumberKey})
AND (o.`tidan_no` is null or o.`tidan_no` != '' or o.`tidan_no` != #{query.notEqNumberKey}) AND (o.`tidan_no` is null or o.`tidan_no` = '' or o.`tidan_no` != #{query.notEqNumberKey})
AND (o.`container_number` is null or o.`container_number` != '' or o.`container_number` != #{query.notEqNumberKey}) AND (o.`container_number` is null or o.`container_number` = '' or o.`container_number` != #{query.notEqNumberKey})
AND (o.`no_charge_record` is null or o.`no_charge_record` != '' or o.`no_charge_record` != #{query.notEqNumberKey}) AND (o.`no_charge_record` is null or o.`no_charge_record` = '' or o.`no_charge_record` != #{query.notEqNumberKey})
AND (o.`initial_parent_order_no` is null or o.`initial_parent_order_no` != '' or o.`initial_parent_order_no` != #{query.notEqNumberKey}) AND (o.`initial_parent_order_no` is null or o.`initial_parent_order_no` = '' or o.`initial_parent_order_no` != #{query.notEqNumberKey})
</if> </if>
<if test="query.prodKey != null and query.prodKey != '' "> <if test="query.prodKey != null and query.prodKey != '' ">
and (o.order_id in( and (o.order_id in(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment