Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -342,18 +342,8 @@
         ldsa.available_quantity, ldsa.is_have_data, ldsa.stock_article_code, ldsa.dealer_name, ldsa.dealer_code,
         ldsa.train_number, ldsa.factory_train, ldsa.sending, ldsa.send_warehouse_id, ldsa.send_warehouse_name,
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status,
-        (select GROUP_CONCAT(DISTINCT lwtg.tray_code)
-        from logpm_distribution_parcel_list ldpl
-        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
-        where ldpl.stock_article_id = ldsa.id) trays,
-        (
-        select GROUP_CONCAT(DISTINCT lwug.position_code)
-        from logpm_distribution_parcel_list ldpl
-        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
-        where ldsa.id = ldpl.stock_article_id
-        ) allocation
+        GROUP_CONCAT( DISTINCT lwtg.tray_code ) trays,
+        GROUP_CONCAT( DISTINCT lwug.position_code ) allocation
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
@@ -455,7 +445,7 @@
                 concat('%',#{param.allocation},'%')
             </if>
         </where>
-        GROUP BY ldsa.id ,ldpl.id
+        group by ldsa.id
     </select>
     <select id="selectOneByWrap" resultType="com.logpm.distribution.vo.app.queryOrderVO">
         SELECT ldsa.* FROM logpm_distribution_parcel_list ldpl join logpm_distribution_stock_article ldsa on