From cb40c1af86a50608ac7ccac0da3f0f88af8239dc Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:25:58 +0800
Subject: [PATCH] 添加设备、点位上的字段
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 5907b0e..ffa4e97 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -14,13 +14,18 @@
private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
- private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
+ private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext;
private static List<WcsPlc> listPlc;
private static List<WcsDevice> listPlcDevice;
private static List<WcsPosition> listPlcStation;
private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
+ //瀵瑰鍏竷杩炴帴鐘舵��
+ public static List<PLCUtil> listPlcConn
+ {
+ get { return listPlcUtil; }
+ }
private static CancellationTokenSource cts;//鍙栨秷绾跨▼鏍囪瘑
public static event EventHandler DeviceValueChangeEvent;
@@ -84,7 +89,7 @@
}
try
{
- var modPlcUtil = listPlcUtil.FirstOrDefault(s => s.PlcId == modPlc.Id);
+ var modPlcUtil = listPlcUtil.FirstOrDefault(s => s != null && s.PlcId == modPlc.Id);
if (modPlcUtil == null)
{
modPlcUtil = new PLCUtil(modPlc);
--
Gitblit v1.8.0