From fa88c3686503c096475486446896d7101dd03955 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 10 Jul 2024 19:30:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=9C=A8=E5=BA=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionParcelListMapper.xml          | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index df0506b05..be84bce3c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -638,12 +638,9 @@
         ldpl.dealer_name, ldpl.dealer_code, ldpl.send_warehouse_id,
         ldpl.send_warehouse_name, ldpl.accept_warehouse_id, ldpl.accept_warehouse_name,
         ldpl.order_package_delivery_status,
-        GROUP_CONCAT(DISTINCT lwt.pallet_name) pallet,
-        GROUP_CONCAT(DISTINCT lwug.position_code) goodsAllocation
+        ldpl.pallet pallet,
+       ldpl.goods_allocation goodsAllocation
         From logpm_distribution_parcel_list ldpl
-        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
-        LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
         <where>
             ldpl.conditions in ('1','3')
             <if test="param.serviceNumber != null and param.serviceNumber != ''">and ldpl.service_number like
@@ -685,10 +682,10 @@
             <if test="param.orderPackageCode != null and param.orderPackageCode != ''">and ldpl.order_package_code like
                 concat('%',#{param.orderPackageCode},'%')
             </if>
-            <if test="param.pallet != null and param.pallet != ''">and lwtg.tray_code like
+            <if test="param.pallet != null and param.pallet != ''">and ldpl.pallet like
                 concat('%',#{param.pallet},'%')
             </if>
-            <if test="param.goodsAllocation != null and param.goodsAllocation != ''">and lwug.position_code like
+            <if test="param.goodsAllocation != null and param.goodsAllocation != ''">and ldpl.goods_allocation like
                 concat('%',#{param.goodsAllocation},'%')
             </if>
             <if test="param.firsts != null and param.firsts != ''">and ldpl.firsts like
@@ -726,7 +723,6 @@
             <if test="param.conditions != null and param.conditions != ''">and ldpl.conditions = #{param.conditions}
             </if>
         </where>
-        GROUP BY ldpl.id
     </select>
     <select id="getPackageList" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT ldpl.id,