From e5ec8b21084eec6086cc66adb569682a32c05dc9 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 03 七月 2025 17:21:27 +0800
Subject: [PATCH] 更新任务异常信息记录功能在CommonConveyorLine_GWJob.cs 文件中,向 WIDESEAWCS_Tasks命名空间添加了一行代码, 将日志信息赋值给taskNext.ExceptionMessage属性,以便在任务处理过程中记录异常信息。

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
index ba178bf..5b84cbd 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
@@ -31,7 +31,7 @@
         public ISqlSugarClient Db => BaseDal.Db;
 
         private PropertyInfo[] _propertyInfo { get; set; } = null;
-        private PropertyInfo[] TProperties
+        public PropertyInfo[] TProperties
         {
             get
             {
@@ -139,7 +139,7 @@
                         }
                         else
                         {
-                            where += $"{searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'";
+                            where += $"[{searchParametersList[i].Name}] like '%{searchParametersList[i].Value}%'";
                         }
                     }
                     else
@@ -151,16 +151,33 @@
                         }
                         else
                         {
-                            where += $" and {searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'";
+                            where += $" and [{searchParametersList[i].Name}] like '%{searchParametersList[i].Value}%'";
                         }
                     }
                 }
                 else
                 {
-                    if (string.IsNullOrEmpty(where))
-                        where += $"{searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'";
+                    if (searchParametersList[i].DisplayType.GetLinqCondition() == LinqExpressionType.ThanOrEqual)
+                    {
+                        if (string.IsNullOrEmpty(where))
+                            where += $"{searchParametersList[i].Name} >= '{searchParametersList[i].Value}'";
+                        else
+                            where += $" and {searchParametersList[i].Name} {searchParametersList[i].DisplayType.GetLinqCondition()} '{searchParametersList[i].Value}'";
+                    }
+                    else if (searchParametersList[i].DisplayType.GetLinqCondition() == LinqExpressionType.LessThanOrEqual)
+                    {
+                        if (string.IsNullOrEmpty(where))
+                            where += $"{searchParametersList[i].Name} <= '{searchParametersList[i].Value}'";
+                        else
+                            where += $" and {searchParametersList[i].Name} <= '{searchParametersList[i].Value}'";
+                    }
                     else
-                        where += $" and {searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'";
+                    {
+                        if (string.IsNullOrEmpty(where))
+                            where += $"{searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'";
+                        else
+                            where += $" and {searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'";
+                    }
                 }
             }
             return where;
@@ -172,7 +189,7 @@
         /// <param name="pageData"></param>
         /// <param name="propertyInfo"></param>
         /// <returns></returns>
-        private Dictionary<string, OrderByType> GetPageDataSort(PageDataOptions pageData, PropertyInfo[] propertyInfo)
+        public Dictionary<string, OrderByType> GetPageDataSort(PageDataOptions pageData, PropertyInfo[] propertyInfo)
         {
             if (!string.IsNullOrEmpty(pageData.Sort))
             {

--
Gitblit v1.9.3