From 4d0ae22c1311f7d947c17ad986a5b1c91afd3ced Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 14:06:19 +0800
Subject: [PATCH] 新增托盘号查询功能并优化异常处理在 `ITaskService.cs` 中添加了 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询输送线执行中的任务。更新了 `TaskService.cs` 中的方法实现，保留原有查询功能并增强查询逻辑。在 `CommonConveyorLine_GWJob.cs` 中修改了 `ConveyorLineOutFinish` 方法，整合新查询逻辑并清理了注释代码。同时，增加了异常处理机制，提升了代码的健壮性。
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
index febe296..c453447 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
@@ -176,7 +176,7 @@
}
else
{
- where += $"{searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'";
+ where += $"[{searchParametersList[i].Name}] like '%{searchParametersList[i].Value}%'";
}
}
else
@@ -188,16 +188,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;
--
Gitblit v1.9.3