控货详情收货人查询调整

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

@@ -8,7 +8,7 @@
         JOIN ecw_order o on o.order_id = occ.order_id
         LEFT JOIN ecw_order_consignor nor ON nor.order_id = o.order_id AND nor.deleted = 0
         LEFT JOIN ecw_customer_contacts ecc on ecc.phone_new = occ.consignee_phone AND ecc.deleted = 0
-        LEFT JOIN ecw_order_consignor nee ON nee.customer_id = ecc.customer_id AND nee.deleted = 0
+        LEFT JOIN ecw_customer nee ON nee.id = ecc.customer_id AND nee.deleted = 0
         LEFT JOIN ecw_warehouse_line ewl on ewl.id = o.line_id
         LEFT JOIN ecw_warehouse ew_start ON ew_start.id = ewl.start_warehouse_id
         LEFT JOIN ecw_warehouse ew_dest ON ew_dest.id = ewl.dest_warehouse_id
@@ -22,11 +22,11 @@
         o.order_id,
         nor.customer_number as consignerNumber,
         nor.customer_id as consignerId,
-        nee.customer_number as consigneeNumber,
-        nee.customer_id as consigneeId,
+        nee.number as consigneeNumber,
+        nee.id as consigneeId,
         nee.NAME as consigneeName,
-        nee.phone as consigneePhone,
-        nee.country_code as consigneeCountryCode,
+        occ.consignee_phone as consigneePhone,
+        occ.consignee_country_code as consigneeCountryCode,
         o.sum_num,
         occ.pick_num,
         occ.pick_volume,
@@ -53,7 +53,7 @@
         JOIN ecw_order o on o.order_id = occ.order_id
         LEFT JOIN ecw_order_consignor nor ON nor.order_id = o.order_id AND nor.deleted = 0
         LEFT JOIN ecw_customer_contacts ecc on ecc.phone_new = occ.consignee_phone AND ecc.deleted = 0
-        LEFT JOIN ecw_order_consignor nee ON nee.customer_id = ecc.customer_id AND nee.deleted = 0
+        LEFT JOIN ecw_customer nee ON nee.id = ecc.customer_id AND nee.deleted = 0
         LEFT JOIN ecw_warehouse_line ewl on ewl.id = o.line_id
         LEFT JOIN ecw_warehouse ew_start ON ew_start.id = ewl.start_warehouse_id
         LEFT JOIN ecw_warehouse ew_dest ON ew_dest.id = ewl.dest_warehouse_id
@@ -80,7 +80,7 @@
         JOIN ecw_order o on o.order_id = occ.order_id
         LEFT JOIN ecw_order_consignor nor ON nor.order_id = o.order_id AND nor.deleted = 0
         LEFT JOIN ecw_customer_contacts ecc on ecc.phone_new = occ.consignee_phone AND ecc.deleted = 0
-        LEFT JOIN ecw_order_consignor nee ON nee.customer_id = ecc.customer_id AND nee.deleted = 0
+        LEFT JOIN ecw_customer nee ON nee.id = ecc.customer_id AND nee.deleted = 0
         LEFT JOIN ecw_warehouse_line ewl on ewl.id = o.line_id
         LEFT JOIN ecw_warehouse ew_start ON ew_start.id = ewl.start_warehouse_id
         LEFT JOIN ecw_warehouse ew_dest ON ew_dest.id = ewl.dest_warehouse_id
@@ -125,8 +125,9 @@
             <!--收货人-->
             <if test="query.consigneeKey != null and query.consigneeKey != '' ">
                 AND (nee.name like concat("%",#{query.consigneeKey},"%") or
-                nee.phone like concat("%",#{query.consigneeKey},"%") or
-                nee.customer_number like concat("%",#{query.consigneeKey},"%") )
+                occ.consignee_phone like concat("%",#{query.consigneeKey},"%") or
+                nee.number like concat("%",#{query.consigneeKey},"%") or
+                occ.consignee_name like concat("%",#{query.consigneeKey},"%") )
             </if>
             <!--状态-->
             <if test="query.pickStateList != null and query.pickStateList.size >0">