Merge branch 'dev' into pre-production

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.logpm.distribution.mapper.DistributionStockArticleStatisticsMapper">
     <select id="collect" resultType="com.logpm.distribution.dto.DistributionStockArticleStatisticsDTO">
      select
-            count(distinct ldsa.waybill_id) waybillNum,
+            count(distinct ldpl.waybill_number) waybillNum,
             count(distinct ldsa.order_code) orderNum,
             count(distinct ldpl.id) packageCodeNum
         from logpm_distribution_stock_article ldsa
@@ -104,8 +104,7 @@
         </if>
         <if test="  param.completeSet != null  ">and ldsa.complete_set like concat('%',#{param.completeSet},'%')
         </if>
-        <if test="  param.typeService != null and param.groundingStatus != '' ">and ldsa.type_service like concat('%',#{param.typeService},'%')
+
-        </if>
         <if test="  param.customerName != null  and param.customerName != ''  ">and ldsa.customer_name like
             concat('%',#{param.customerName},'%')
         </if>