配送详情页订单列表修复零担订单不展示BUG

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,15 +350,8 @@
                 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
+        <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>
@@ -387,6 +389,8 @@
                 and t.materialName like concat('%',#{param.materialName},'%')
             </if>
 
+        </where>
+
     </select>
     <select id="selectAppcustomList" resultType="com.logpm.distribution.vo.app.DistributionAppReservationVO">
         SELECT