订单列表相关查询都要排除已删除的订单收发货人信息

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -111,8 +111,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0
         <if test="query.pdaStartWareIds != null and query.pdaStartWareIds != '' ">
@@ -1291,8 +1291,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test="query.deptId != null ">
@@ -1431,8 +1431,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test="query.deptId != null ">
@@ -1462,8 +1462,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test="query.deptId != null ">
@@ -1489,8 +1489,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test="query.deptId != null ">
@@ -3872,8 +3872,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         AND o.dept_id = #{query.deptId}
@@ -3998,8 +3998,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         AND o.dept_id = #{query.deptId}
@@ -4013,8 +4013,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         AND o.dept_id = #{query.deptId}
@@ -4026,8 +4026,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         AND o.dept_id = #{query.deptId}
@@ -4150,8 +4150,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         AND (
@@ -4170,8 +4170,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         AND (
@@ -4279,8 +4279,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         left join ecw_order_cargo_control occ
         on occ.order_id = o.order_id and occ.is_actual = 1 and occ.deleted = 0
@@ -4386,8 +4386,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         left join ecw_order_cargo_control occ
         on occ.order_id = o.order_id and occ.is_actual = 1 and occ.deleted = 0
@@ -4403,8 +4403,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         left join ecw_order_cargo_control occ
         on occ.order_id = o.order_id and occ.is_actual = 1 and occ.deleted = 0
@@ -4418,8 +4418,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         left join ecw_order_cargo_control occ
         on occ.order_id = o.order_id and occ.is_actual = 1 and occ.deleted = 0
@@ -4505,8 +4505,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_order_cargo_control occ
         on occ.order_id = o.order_id and occ.is_actual = 1 and occ.deleted = 0
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
@@ -4523,8 +4523,8 @@
         from ecw_order o
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_order_cargo_control occ
         on occ.order_id = o.order_id and occ.is_actual = 1 and occ.deleted = 0
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
@@ -5138,10 +5138,8 @@
         nee.country_code as consignee_country_code,
         nee.phone as consignee_phone
         from ecw_order o
-        left join ecw_order_consignor nor
-        on nor.order_id = o.order_id
-        left join ecw_order_consignee nee
-        on nee.order_id = nor.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_order_cargo_control occ
         on occ.order_id = nor.order_id and occ.is_actual = 1 and occ.deleted = 0
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
@@ -5372,10 +5370,8 @@
         nee.country_code as consignee_country_code,
         nee.phone as consignee_phone
         from ecw_order o
-        left join ecw_order_consignor nor
-        on nor.order_id = o.order_id
-        left join ecw_order_consignee nee
-        on nee.order_id = nor.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_order_cargo_control occ
         on occ.order_id = nor.order_id and occ.is_actual = 1 and occ.deleted = 0
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
@@ -5660,8 +5656,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test="query.deptId != null ">
@@ -5759,8 +5755,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test="query.deptId != null ">
@@ -5801,8 +5797,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test="query.deptId != null ">
@@ -5843,8 +5839,8 @@
         ) w ON w.line_id = o.line_id
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test="query.deptId != null ">
@@ -5892,8 +5888,8 @@
         ON it.order_id = o.order_id and it.deleted = 0
         left join ecw_order_departure de on de.order_id = o.order_id
         left join ecw_order_objective ob on ob.order_id = o.order_id
-        left join ecw_order_consignor nor on nor.order_id = o.order_id
-        left join ecw_order_consignee nee on nee.order_id = o.order_id
+        left join ecw_order_consignor nor on nor.order_id = o.order_id and nor.deleted = 0
+        left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
         left join ecw_channel channel on channel.channel_id = o.channel_id
         where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
         <if test = "query.deptId != null ">