From b748db662fc3fef401ae357df30f1417f661aef3 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 14 Jun 2024 17:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=89=AB=E6=8F=8F=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockupMapper.xml         | 16 ++++++++++++++--
 .../impl/DistributionAsyncServiceImpl.java       |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 5bb34f9df..1916c8247 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -265,11 +265,23 @@
         FROM
         logpm_distribution_stockup AS a
         LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id
-        WHERE b.stock_status != 4
+        <where>
+            b.stock_status != 4
+            <if test="param.warehouseId != null and param.warehouseId != '' ">and a.warehouse_id =
+                #{param.warehouseId}
+            </if>
+            <if test="param.warehouseIdList != null">
+                and a.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="a" open="(" separator="," close=")">
+                    #{a}
+                </foreach>
+            </if>
+        </where>
         GROUP BY b.stockup_id
         ) AS aa ON aa.stockup_id = lds.id
         <where>
-            lds.is_deleted = 0 AND aa.aaa > 0 AND ldsi.stock_status != 4
+            lds.is_deleted = 0  AND ldsi.stock_status != 4
+            <!--            AND aa.aaa > 0-->
             <!-- lds.tenant_id = #{param.tenantId} -->
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =  #{param.typeService}
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index c4111c57b..1ef31699f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -2106,6 +2106,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			}
 			DistributionReservationStocklistEntity reservationStocklistEntity = new DistributionReservationStocklistEntity();
 			reservationStocklistEntity.setId(one1.getId());
+			reservationStocklistEntity.setReservationId(one1.getReservationId());
 			//维护备货时间
 			if (ObjectUtils.isNull(one1.getStartTimeStocking())) {
 				reservationStocklistEntity.setStockStatus("2");