From d606315f9492dd850978bb5b248a3f9e5cbee2fe Mon Sep 17 00:00:00 2001
From: "yang.lee" <whitebig@126.com>
Date: Wed, 15 Nov 2023 10:16:34 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8A=A8=E6=80=81=E7=94=9F=E6=88=90=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=202=E3=80=81LambdaExpressionExtensi?=
 =?UTF-8?q?ons=20=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE=E5=BC=8F=E6=A0=91?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.WarehouseMgr/WmsCheckTaskService.cs   | 43 +++++++++++++------
 .../Extension/LambdaExpressionExtensions.cs   | 17 ++++++++
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
index 951f5ab0..d00f1dc2 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
@@ -13,7 +13,6 @@ using JNPF.VisualDev.Interfaces;
 using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
-using NPOI.SS.Formula.Functions;
 using SqlSugar;
 using Tnb.BasicData.Entities;
 using Tnb.WarehouseMgr.Entities;
@@ -112,12 +111,33 @@ namespace Tnb.WarehouseMgr
                             areaIds = input.data[nameof(WmsCheckstockH.area_id)].ToObject<string[]>();
                         }
 
-                        filterExpable = checkType!.ToEnum<EnumCheckType>() switch
+                        Expression<Func<BasLocation, WmsCarryCode, WmsCarryH, bool>> filterExp = (a, b, c) => false;
+                        switch (checkType?.ToEnum<EnumCheckType>())
                         {
-                            EnumCheckType.物料盘点 => filterExpable.AndIF(input.data.ContainsKey(nameof(WmsCarryCode.material_id)) && input.data[nameof(WmsCarryCode.material_id)] != null, (a, b, c) => b.material_id == input.data[nameof(WmsCarryCode.material_id)].ToString()),
-                            EnumCheckType.批次盘点 => filterExpable.AndIF(areaIds?.Length > 0, (a, b, c) => areaIds.Contains(a.region_id)),
-                            _ => filterExpable,
-                        };
+                            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;
+                                }
+                                break;
+                            case EnumCheckType.物料盘点:
+                                {
+                                    if (!input.data.ContainsKey(nameof(WmsCarryCode.material_id)) && input.data[nameof(WmsCarryCode.material_id)] != null)
+                                    {
+                                        filterExp = (a, b, c) => b.material_id == input.data[nameof(WmsCarryCode.material_id)].ToString();
+                                    }
+                                }
+                                break;
+                            case EnumCheckType.批次盘点:
+                                {
+                                    if (areaIds?.Length > 0)
+                                    {
+                                        filterExp = (a, b, c) => areaIds.Contains(a.region_id);
+                                    }
+                                }
+                                break;
+                        }
 
                         var carryCodes = await _db.Queryable<BasLocation>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.location_id)
                                                   .InnerJoin<WmsCarryH>((a, b, c) => b.carry_id == c.id)
@@ -320,22 +340,21 @@ namespace Tnb.WarehouseMgr
                 _carryMap = await _db.Queryable<WmsCarryH>().ToDictionaryAsync(x => x.id, x => x.carry_code);
             }
 
-            //var filterExpable = Expressionable.Create<BasLocation, WmsCarryCode, WmsCarryH>();
             Expression<Func<BasLocation, WmsCarryCode, WmsCarryH, bool>> filterExp = (a, b, c) => false;
             switch (input.CheckType)
             {
                 case EnumCheckType.全库盘点:
                     {
-                        filterExp.And((a, b, c) => a.wh_id == input.warehouse_id)
-                                                      .And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString())
-                                                      .And((a, b, c) => c.is_lock == 0);
+                        filterExp = (a, b, c) => a.wh_id == input.warehouse_id
+                                                      && a.is_type == ((int)EnumLocationType.存储库位).ToString()
+                                                      && c.is_lock == 0;
                     }
                     break;
                 case EnumCheckType.物料盘点:
                     {
                         if (!input.material_id.IsNullOrWhiteSpace())
                         {
-                            filterExp.And((a, b, c) => b.material_id == input.material_id);
+                            filterExp = (a, b, c) => b.material_id == input.material_id;
                         }
                     }
                     break;
@@ -343,7 +362,7 @@ namespace Tnb.WarehouseMgr
                     {
                         if (input.regionIds?.Count > 0)
                         {
-                            filterExp.And((a, b, c) => input.regionIds.Contains(a.region_id));
+                            filterExp = (a, b, c) => input.regionIds.Contains(a.region_id);
                         }
                     }
                     break;
diff --git a/common/Tnb.Common/Extension/LambdaExpressionExtensions.cs b/common/Tnb.Common/Extension/LambdaExpressionExtensions.cs
index b0b1b420..04ab917b 100644
--- a/common/Tnb.Common/Extension/LambdaExpressionExtensions.cs
+++ b/common/Tnb.Common/Extension/LambdaExpressionExtensions.cs
@@ -59,6 +59,23 @@ namespace JNPF.Common.Extension
 
             return first.Compose(second, Expression.And);
         }
+
+        /// <summary>
+        /// or扩展
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="first"></param>
+        /// <param name="second"></param>
+        /// <returns></returns>
+        public static Expression<Func<T1, T2, T3, bool>> Or<T1, T2, T3>(this Expression<Func<T1, T2, T3, bool>> first, Expression<Func<T1, T2, T3, bool>> second)
+        {
+            if (first.IsNull())
+            {
+                first = second;
+                return first;
+            }
+            return first.Compose(second, Expression.Or);
+        }
     }