From 9bf7d055d56a11730a7f5e98851ba1f41ce46a8e Mon Sep 17 00:00:00 2001
From: hlb <894797954@qq.com>
Date: Thu, 16 Nov 2023 14:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E5=92=8C=E6=89=B9=E6=AC=A1=E7=9B=98=E7=82=B9=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
index c54969ce..e4af88f7 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
@@ -354,7 +354,10 @@ namespace Tnb.WarehouseMgr
                     {
                         if (!input.material_id.IsNullOrWhiteSpace())
                         {
-                            filterExp = (a, b, c) => b.material_id == input.material_id;
+                            filterExp = (a, b, c) => a.wh_id == input.warehouse_id 
+                                                     && b.material_id == input.material_id
+                                                     && a.is_type == ((int)EnumLocationType.存储库位).ToString()
+                                                     && c.is_lock == 0;
                         }
                     }
                     break;
@@ -362,7 +365,10 @@ namespace Tnb.WarehouseMgr
                     {
                         if (input.regionIds?.Count > 0)
                         {
-                            filterExp = (a, b, c) => input.regionIds.Contains(a.region_id);
+                            filterExp = (a, b, c) => a.wh_id == input.warehouse_id 
+                                                     && input.regionIds.Contains(a.region_id)
+                                                     && a.is_type == ((int)EnumLocationType.存储库位).ToString()
+                                                     && c.is_lock == 0;
                         }
                     }
                     break;