|
|
|
@ -98,7 +98,7 @@
|
|
|
|
|
`ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, |
|
|
|
|
`ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, |
|
|
|
|
`ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, |
|
|
|
|
`ldl`.`create_time` AS `operatorTime`, |
|
|
|
|
`ldl`.`update_time` AS `operatorTime`, |
|
|
|
|
`ldl`.`create_user` AS `operatorId`, |
|
|
|
|
'取消装车' AS `scanNodeType`, |
|
|
|
|
'配送' AS `nodeName` |
|
|
|
@ -143,6 +143,9 @@
|
|
|
|
|
<if test="param.thirdProduct != null and param.thirdProduct != '' "> |
|
|
|
|
and ldpl.third_product like concat('%',#{param.thirdProduct},'%') |
|
|
|
|
</if> |
|
|
|
|
<if test="param.date != null and param.date != '' "> |
|
|
|
|
and ldl.update_time like concat(#{param.date},'%') |
|
|
|
|
</if> |
|
|
|
|
</where> |
|
|
|
|
UNION ALL |
|
|
|
|
SELECT |
|
|
|
@ -241,6 +244,9 @@
|
|
|
|
|
<if test="param.thirdProduct != null and param.thirdProduct != '' "> |
|
|
|
|
and ldpl.third_product like concat('%',#{param.thirdProduct},'%') |
|
|
|
|
</if> |
|
|
|
|
<if test="param.date != null and param.date != '' "> |
|
|
|
|
and ldl.create_time like concat(#{param.date},'%') |
|
|
|
|
</if> |
|
|
|
|
</where> |
|
|
|
|
UNION ALL |
|
|
|
|
SELECT |
|
|
|
@ -296,7 +302,7 @@
|
|
|
|
|
`ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, |
|
|
|
|
`ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, |
|
|
|
|
`ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, |
|
|
|
|
`ldl`.`create_time` AS `operatorTime`, |
|
|
|
|
`ldl`.`update_time` AS `operatorTime`, |
|
|
|
|
`ldl`.`create_user` AS `operatorId`, |
|
|
|
|
'签收' AS `scanNodeType`, |
|
|
|
|
'配送' AS `nodeName` |
|
|
|
@ -339,6 +345,9 @@
|
|
|
|
|
<if test="param.thirdProduct != null and param.thirdProduct != '' "> |
|
|
|
|
and ldpl.third_product like concat('%',#{param.thirdProduct},'%') |
|
|
|
|
</if> |
|
|
|
|
<if test="param.date != null and param.date != '' "> |
|
|
|
|
and ldl.update_time like concat(#{param.date},'%') |
|
|
|
|
</if> |
|
|
|
|
</where> |
|
|
|
|
UNION ALL |
|
|
|
|
SELECT |
|
|
|
@ -443,6 +452,9 @@
|
|
|
|
|
<if test="param.thirdProduct != null and param.thirdProduct != '' "> |
|
|
|
|
and ldpl.third_product like concat('%',#{param.thirdProduct},'%') |
|
|
|
|
</if> |
|
|
|
|
<if test="param.date != null and param.date != '' "> |
|
|
|
|
and lds.create_time like concat(#{param.date},'%') |
|
|
|
|
</if> |
|
|
|
|
</where> |
|
|
|
|
UNION ALL |
|
|
|
|
SELECT |
|
|
|
@ -540,6 +552,9 @@
|
|
|
|
|
<if test="param.thirdProduct != null and param.thirdProduct != '' "> |
|
|
|
|
and ldpl.third_product like concat('%',#{param.thirdProduct},'%') |
|
|
|
|
</if> |
|
|
|
|
<if test="param.date != null and param.date != '' "> |
|
|
|
|
and lwug.create_time like concat(#{param.date},'%') |
|
|
|
|
</if> |
|
|
|
|
</where> |
|
|
|
|
UNION ALL |
|
|
|
|
SELECT |
|
|
|
@ -637,6 +652,9 @@
|
|
|
|
|
<if test="param.thirdProduct != null and param.thirdProduct != '' "> |
|
|
|
|
and ldpl.third_product like concat('%',#{param.thirdProduct},'%') |
|
|
|
|
</if> |
|
|
|
|
<if test="param.date != null and param.date != '' "> |
|
|
|
|
and lwtg.create_time like concat(#{param.date},'%') |
|
|
|
|
</if> |
|
|
|
|
</where> |
|
|
|
|
|
|
|
|
|
</select> |
|
|
|
|