From 600381f3c5d05894b5567f1e4ad12d56b8223797 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Tue, 19 Dec 2023 15:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml  | 3 +++
 .../service/impl/DistributionStockArticleServiceImpl.java   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 26e249d6c..947a63bb6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -438,6 +438,9 @@
             <if test=" param.orderCodeNumLike != '' and param.orderCodeNumLike != null  ">and ldsa.order_code like
                 concat('%',#{param.orderCodeNumLike},'%')
             </if>
+            <if test=" param.reservation != '' and param.reservation != null  ">
+             and ldsa.reservation_status in (10,20)
+            </if>
             <if test=" param.waybillNumList != null  ">
                 and ldpl.waybill_number in
                 <foreach collection="param.waybillNumList" open="(" item="a" close=")" separator=",">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 595d04b61..e22704753 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -836,9 +836,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			}
 		}
 
-		if(Func.isNotEmpty(stockArticleEntity.getReservation())){
-			stockArticleEntity.setReservationStatus("10");
-		}
+//		if(Func.isNotEmpty(stockArticleEntity.getReservation())){
+//			stockArticleEntity.setReservationStatus("10");
+//		}
 		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWatchWarehouse();
 		List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());