From d1a8d739ce4d754690b6a331b98715cd53608e44 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 6 Mar 2024 14:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E9=A1=B5=E9=9D=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionSignforMapper.xml   | 3 +++
 .../service/impl/DistributionSignforServiceImpl.java          | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 6b0579f8e..6c38cd855 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -1140,6 +1140,9 @@
             <if test="param.signingStatus != null and param.signingStatus!=''">
                 and lds.signing_status = #{param.signingStatus}
             </if>
+            <if test="param.warehouseId != null and param.warehouseId!=''">
+                and ldr.warehouse_id = #{param.warehouseId} AND lddl.warehouse_id =#{param.warehouseId}
+            </if>
         </where>
     </select>
     <select id="selectPushOldPackage" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index f1825a843..1c676a814 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -1433,6 +1433,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (ObjectUtils.isNotNull(o)) {
 			distributionSignfor.remove("ids");
 		}
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Func.isNotEmpty(myCurrentWarehouse)){
+			distributionSignfor.put("warehouseId",myCurrentWarehouse.getId());
+		}
 
 		DistributionSignforVO distributionSignforVO = JSON.parseObject(JSON.toJSONString(distributionSignfor), DistributionSignforVO.class);
 		if (ObjectUtils.isNotNull(o)) {