From a5fec958ef86371826ed4eb947ea0ebd476cd0ed Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 04 七月 2025 15:10:37 +0800
Subject: [PATCH] 修复方法声明并重构命令发送逻辑在 ITaskService.cs中QueryExecutingConveyorLineTask方法的声明末尾添加了分号。注释掉了多处 conveyorLine.SendCommand的调用，并替换为 SendCommand方法，确保在发送命令时设置了必要的值。 在 RequestInbound.cs中，进行了类似的重构，更新了任务状态。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
index 71e0481..e273c4e 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
@@ -177,7 +177,7 @@
}
else
{
- where += $"{searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'";
+ where += $"[{searchParametersList[i].Name}] like '%{searchParametersList[i].Value}%'";
}
}
else
@@ -189,16 +189,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