From f0920b746b39c1566cc6fb71cd41c1e17ae1c9d5 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 19 Nov 2024 10:01:25 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockListInfoMapper.xml       |  1 -
 .../mapper/DistrilbutionBillLadingMapper.xml  | 43 ++++++++++---------
 .../DistrilbutionBillLadingServiceImpl.java   |  4 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml
index 986bc6d9b..3f57af7e2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml
@@ -180,7 +180,6 @@
         lddd.is_deleted = 0
         AND lddd.stock_list_id = #{stockListId}
         AND lddd.inventory_status != 2
-        AND IFNULL(SUM(ldsld.num),0) > 0
         GROUP BY
         ldbl.id
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 35e8c6074..2f51ba06a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -74,8 +74,8 @@
         AND dbp2.packet_bar_status IN ( 1, 3 )
         LEFT JOIN logpm_distribution_parcel_list ldpl2 ON dbp2.parce_list_id = ldpl2.id
         <where>
-            1=1
-            <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
+            dbl2.is_deleted = 0
+            <if test="collect != null ">
                 and dbl2.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">
                     #{item}
@@ -126,16 +126,17 @@
         dsa.storage_fee
         FROM
         logpm_distrilbution_bill_lading aaa
-        LEFT JOIN logpm_distrilbution_bill_stock lds ON lds.bill_lading_id = aaa.id AND lds.order status != 2
+        LEFT JOIN logpm_distrilbution_bill_stock lds ON lds.bill_lading_id = aaa.id AND lds.order_status != 2
         LEFT JOIN logpm_distribution_stock_article dsa ON lds.stock_article_id = dsa.id
-        WHERE
-        aaa.is_deleted = 0
-        <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
-            and aaa.warehouse_id in
-            <foreach collection="collect" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
+        <where>
+            aaa.is_deleted = 0
+            <if test="collect != null ">
+                and aaa.warehouse_id in
+                <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
         GROUP BY
         aaa.id
         ) AS k
@@ -155,14 +156,16 @@
         AND lddd.is_deleted = 0
         LEFT JOIN logpm_distribution_stock_list ldsl ON lddd.stock_list_id = ldsl.id
         LEFT JOIN logpm_basicdata_client lbc ON ldsl.market_id = lbc.id
-        WHERE
-        lddd.inventory_status != 2
-        <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
-            and bbb.warehouse_id in
-            <foreach collection="collect" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
+        <where>
+            lddd.inventory_status != 2
+            <if test="collect != null ">
+                and bbb.warehouse_id in
+                <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
         GROUP BY
         bbb.id
         ) AS m ON m.id = k.id
@@ -179,7 +182,7 @@
             <if test="param.pickUpTimeStart != null">
                 AND DATE_FORMAT(dbl.pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
             </if>
-            <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
+            <if test="collect != null ">
                 and dbl.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">
                     #{item}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 76e67a810..8ea29f87f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -2561,7 +2561,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = null;
 
 		List<Long> collect = basicdataWarehouseClient.getWarehouseIds();
-
+		if (collect.isEmpty()) {
+			collect = null;
+		}
 
 		distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);