From 08dd2afd7a9614dad029e94918516b068d413cac Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期四, 04 七月 2024 17:46:41 +0800
Subject: [PATCH] 大屏
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs"
index 51ab901..0dfc40e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs"
@@ -139,7 +139,7 @@
//string str = DataParse.GetStr(bytes, 0);
//return (DataType)(str as object);
var str = GetContent(siemensPLCClient.ReadString(dbAddress, (ushort)len), dbAddress).ToString();
- str = str.Replace("\0", "")?.Replace("\\", "")?.Replace("\u0014", "")?.Replace("?\u0006", "")?.Replace("\n", "")?.Replace("?", "")?.Trim();
+ str = str.Replace("\0", "")?.Replace("\\", "")?.Replace("\u0014", "")?.Replace("?\u0006", "")?.Replace("\u000e\u000e", "")?.Replace("\n", "")?.Replace("?", "")?.Trim();
return (DataType)(str as object);
}
else
@@ -155,8 +155,17 @@
/// <returns></returns>
public override DataType ReadByOrder<DataType>(string orderName, string Method = null)
{
- var item = itemGroups.Where(t => t.name.Equals(orderName)).FirstOrDefault();
- if (Method != null) { item = itemGroups.Where(t => t.name.Equals(orderName) && t.Methods.Equals(Method)).FirstOrDefault(); }
+ DBItemGroup item = null;
+ //var item = itemGroups.Where(t => t.name.Equals(orderName)).FirstOrDefault();
+ //if (Method != null) { item = itemGroups.Where(t => t.name.Equals(orderName) && t.Methods.Equals(Method)).FirstOrDefault(); }
+ var items = itemGroups.Where(t => t.name.Contains(orderName)).ToList();
+ if (items.Count > 0)
+ {
+ if (Method != null)
+ item = items.Where(t => t.Methods.Contains(Method)).FirstOrDefault();
+ else
+ item = items.Where(t => t.name.Contains(orderName)).FirstOrDefault();
+ }
if (item == null)
{
throw new Exception($"PLC{PLCName},鏈畾涔夋寚浠orderName}");
--
Gitblit v1.9.3