From b384f47eab61e102d8c63a6a16e9b6b959a0bb11 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 20 Apr 2024 07:05:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=80=BB=E6=95=B0=E7=BB=9F=E8=AE=A1=20=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockArticleStatisticsMapper.xml      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml
index 58e78fd06..3f071059a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml
+++ b/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>