From 52dd81d8860188e901135c1c09b04236428d7257 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 18 Mar 2024 11:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E4=BF=AE=E5=A4=8D=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E8=AE=A2=E5=8D=95=E4=B8=8D=E5=B1=95=E7=A4=BABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionDeliveryInfoMapper.xml | 98 ++++++++++---------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index a6beae1dc..2ba651f41 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -299,8 +299,17 @@
                             ldsa.waybill_number,
                             ldsa.service_number,
                             ldrs.reservation_num AS deliveryNumber,
-                            t.materialName,
---                      (SELECT COUNT(*) from logpm_distribution_reservation_package ldrp WHERE ldrp.stock_article_id = ldsa.id ) deliveryNumber,
+                            (
+                            SELECT DISTINCT
+                            group_concat( DISTINCT ldpl.material_name ) AS materialName
+                            FROM
+                            logpm_distribution_parcel_list ldpl
+                            WHERE
+                            ldpl.stock_article_id = ldsa.id
+                            GROUP BY
+                            ldpl.stock_article_id
+                            ) AS materialName,
+<!--                   (SELECT COUNT(*) from logpm_distribution_reservation_package ldrp WHERE ldrp.stock_article_id = ldsa.id ) deliveryNumber,-->
                      (
                          SELECT
                              count(*)
@@ -341,51 +350,46 @@
                 JOIN logpm_distribution_reservation_stockarticle ldrs ON lds.reservation_id = ldrs.reservation_id
                 JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
                 JOIN logpm_distribution_stock_article ldsa ON ldrs.stock_article_id = ldsa.id
-                JOIN
-        (SELECT
-        DISTINCT ldpl.stock_article_id,GROUP_CONCAT(DISTINCT ldpl.material_name) AS materialName
-        FROM
-        logpm_distribution_parcel_list ldpl
-        JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
-        GROUP BY ldpl.stock_article_id
-        ) AS t ON t.stock_article_id = ldsa.id
-        where  lddl.id = #{param.deliveryId} AND ldrs.stock_article_status != 2
-        <if test="param.orderCode != '' and param.orderCode != null">
-           and ldsa.order_code like concat('%',#{param.orderCode},'%')
-        </if>
-        <if test="param.consigneeUnit != '' and param.consigneeUnit != null">
-           and ldsa.consignee_unit like concat('%',#{param.consigneeUnit},'%')
-        </if>
-        <if test="param.consigneePerson != '' and param.consigneePerson != null">
-           and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%')
-        </if>
-        <if test="param.consigneePerson != '' and param.consigneePerson != null">
-           and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%')
-        </if>
-        <if test="param.consigneeAddress != '' and param.consigneeAddress != null">
-           and ldsa.consignee_address like concat('%',#{param.consigneeAddress},'%')
-        </if>
-        <if test="param.consigneeMobile != '' and param.consigneeMobile != null">
-           and ldsa.consignee_mobile like concat('%',#{param.consigneeMobile},'%')
-        </if>
-        <if test="param.customerName != '' and param.customerName != null">
-           and ldsa.customer_name like concat('%',#{param.customerName},'%')
-        </if>
-        <if test="param.customerTelephone != '' and param.customerTelephone != null">
-           and ldsa.customer_telephone like concat('%',#{param.customerTelephone},'%')
-        </if>
-        <if test="param.customerAddress != '' and param.customerAddress != null">
-           and ldsa.customer_address like concat('%',#{param.customerAddress},'%')
-        </if>
-        <if test="param.waybillNumber != '' and param.waybillNumber != null">
-           and ldsa.waybill_number like concat('%',#{param.waybillNumber},'%')
-        </if>
-        <if test="param.serviceNumber != '' and param.serviceNumber != null">
-           and ldsa.service_number like concat('%',#{param.serviceNumber},'%')
-        </if>
-        <if test="param.materialName != '' and param.materialName != null">
-           and t.materialName like concat('%',#{param.materialName},'%')
-        </if>
+        <where>
+            lddl.id = #{param.deliveryId} AND ldrs.stock_article_status != 2
+            <if test="param.orderCode != '' and param.orderCode != null">
+                and ldsa.order_code like concat('%',#{param.orderCode},'%')
+            </if>
+            <if test="param.consigneeUnit != '' and param.consigneeUnit != null">
+                and ldsa.consignee_unit like concat('%',#{param.consigneeUnit},'%')
+            </if>
+            <if test="param.consigneePerson != '' and param.consigneePerson != null">
+                and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%')
+            </if>
+            <if test="param.consigneePerson != '' and param.consigneePerson != null">
+                and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%')
+            </if>
+            <if test="param.consigneeAddress != '' and param.consigneeAddress != null">
+                and ldsa.consignee_address like concat('%',#{param.consigneeAddress},'%')
+            </if>
+            <if test="param.consigneeMobile != '' and param.consigneeMobile != null">
+                and ldsa.consignee_mobile like concat('%',#{param.consigneeMobile},'%')
+            </if>
+            <if test="param.customerName != '' and param.customerName != null">
+                and ldsa.customer_name like concat('%',#{param.customerName},'%')
+            </if>
+            <if test="param.customerTelephone != '' and param.customerTelephone != null">
+                and ldsa.customer_telephone like concat('%',#{param.customerTelephone},'%')
+            </if>
+            <if test="param.customerAddress != '' and param.customerAddress != null">
+                and ldsa.customer_address like concat('%',#{param.customerAddress},'%')
+            </if>
+            <if test="param.waybillNumber != '' and param.waybillNumber != null">
+                and ldsa.waybill_number like concat('%',#{param.waybillNumber},'%')
+            </if>
+            <if test="param.serviceNumber != '' and param.serviceNumber != null">
+                and ldsa.service_number like concat('%',#{param.serviceNumber},'%')
+            </if>
+            <if test="param.materialName != '' and param.materialName != null">
+                and t.materialName like concat('%',#{param.materialName},'%')
+            </if>
+
+        </where>
 
     </select>
     <select id="selectAppcustomList" resultType="com.logpm.distribution.vo.app.DistributionAppReservationVO">