From 6b68425fc633b7d0daee7a43806ee7498998a40f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 11 九月 2024 14:44:14 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index a7eff8f..c301944 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -33,6 +33,12 @@
{
get { return listPlcUtil; }
}
+ // 浜や簰鐐归泦鍚�
+ public static List<WcsDevice> plcDevices
+ {
+ get { return listPlcDevice; }
+ }
+
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
{
@@ -145,7 +151,7 @@
dto.listStation = listPlcStation.Where(s => s.DeviceId == modDevice.Id).ToList();
dto.listDevice = listDevice.Where(s => s.StationNum == modDevice.StationNum && s.Level == DeviceLevelEnum.Station).ToList();
//杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
- //DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
+ DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
}
else if (!modPlcUtil.Connected)
{
--
Gitblit v1.8.0