From 4e01fd41767adcb63d0c383b26bff32c9be28260 Mon Sep 17 00:00:00 2001
From: "yang.lee" <whitebig@126.com>
Date: Thu, 16 Nov 2023 16:41:15 +0800
Subject: [PATCH] 1

---
 .../Tnb.WarehouseMgr/WmsCheckTaskService.cs         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
index 796aa716..eb660387 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
@@ -110,15 +110,18 @@ namespace Tnb.WarehouseMgr
                         {
                             areaIds = input.data[nameof(WmsCheckstockH.area_id)].ToObject<string[]>();
                         }
-
                         Expression<Func<BasLocation, WmsCarryCode, WmsCarryH, bool>> filterExp = (a, b, c) => false;
+                        var filerExpable = Expressionable.Create<BasLocation, WmsCarryCode, WmsCarryH>()
+                             .And((a, b, c) => a.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString())
+                             .And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString())
+                             .And((a, b, c) => c.is_lock == 0);
+
+
                         switch (checkType?.ToEnum<EnumCheckType>())
                         {
                             case EnumCheckType.全库盘点:
                                 {
-                                    filterExp = (a, b, c) => a.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString()
-                                                                  && a.is_type == ((int)EnumLocationType.存储库位).ToString()
-                                                                  && c.is_lock == 0;
+                                    filterExp = filerExpable.ToExpression();
                                 }
                                 break;
                             case EnumCheckType.物料盘点:
@@ -341,8 +344,6 @@ namespace Tnb.WarehouseMgr
             }
 
             Expression<Func<BasLocation, WmsCarryCode, WmsCarryH, bool>> filterExp = (a, b, c) => false;
-
-
             var filerExpable = Expressionable.Create<BasLocation, WmsCarryCode, WmsCarryH>()
                  .And((a, b, c) => a.wh_id == input.warehouse_id)
                  .And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString())