From 355889b3901697b8bb1726be02c1a3c26dd6b447 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 10 Apr 2024 20:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E6=94=B6=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockArticleMapper.xml             | 8 ++++----
 .../service/impl/DistributionStockArticleServiceImpl.java | 5 +++++
 2 files changed, 9 insertions(+), 4 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 6a7c6b6b1..64aa8d9a0 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
@@ -1289,16 +1289,16 @@
             <if test="  param.warehouseEntryTimeEnd  != null  ">and DATE(k.earliestWarehouseEntryTime) &lt;
                 #{param.warehouseEntryTimeEnd}
             </if>
-            <if test="  param.signingTimeStart  != null  ">and DATE(m.signing_time) &gt;
+            <if test="  param.signingTimeStart  != null  ">and DATE(m.signing_time) &gt;=
                 #{param.signingTimeStart}
             </if>
-            <if test="  param.signingTimeEnd  != null  ">and DATE(m.signing_time) &lt;
+            <if test="  param.signingTimeEnd  != null  ">and DATE(m.signing_time) &lt;=
                 #{param.signingTimeEnd}
             </if>
-            <if test="  param.scanSigningTimeStart  != null  ">and DATE(j.scanSigningTime) &gt;
+            <if test="  param.scanSigningTimeStart  != null  ">and DATE(j.scanSigningTime) &gt;=
                 #{param.scanSigningTimeStart}
             </if>
-            <if test="  param.scanSigningTimeEnd != null  ">and DATE(j.scanSigningTime) &lt;
+            <if test="  param.scanSigningTimeEnd != null  ">and DATE(j.scanSigningTime) &lt;=
                 #{param.scanSigningTimeEnd}
             </if>
         </where>
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 ec26e6dee..31e0defe8 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
@@ -1992,6 +1992,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 //			stockArticleEntity.setReservationStatus("10");
 //		}
 		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWarehouseList();
+		BasicdataWarehouseEntity currentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
 
 		if (collect.size() > 1) {
@@ -1999,6 +2000,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		} else if (collect.size() == 1) {
 			stockArticleEntity.setWarehouseId(collect.get(0));
 		}
+		if (Func.isNotEmpty(currentWarehouse)){
+			stockArticleEntity.setWarehouseIdList(null);
+			stockArticleEntity.setWarehouseId(currentWarehouse.getId());
+		}
 		IPage<DistributionSignforStockArticleVO> distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity);
 		//处理创建人
 		distributionStockArticleEntityIPage.getRecords().forEach(a -> {