From 2f0e0fa257c147a223d79ff8a52118768f43eee8 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 11 九月 2024 18:53:35 +0800
Subject: [PATCH] 修改输送线交互逻辑
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index a7eff8f..4af0bf5 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -13,6 +13,8 @@
public static bool boOffline = false;
//鑷埛鏂�
public static bool boRefresh = false;
+ //婕旂ず妯″紡
+ public static bool boDemo = false;
public static List<PlcPositionInfo> listPositionInfo = new List<PlcPositionInfo>();
@@ -33,6 +35,17 @@
{
get { return listPlcUtil; }
}
+ // 浜や簰鐐归泦鍚�
+ public static List<WcsDevice> plcDevices
+ {
+ get { return listPlcDevice; }
+ }
+ // 浜や簰鐐归泦鍚�
+ public static List<WcsPosition> plcStation
+ {
+ get { return listPlcStation; }
+ }
+
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
{
@@ -41,6 +54,7 @@
boRunningState = _sysConfigService.GetConfigValue<bool>("sys_RunningState").Result;
boOffline = _sysConfigService.GetConfigValue<bool>("sys_Offline").Result;
boRefresh = _sysConfigService.GetConfigValue<bool>("sys_Refresh").Result;
+ boDemo = _sysConfigService.GetConfigValue<bool>("sys_demo").Result;
}
/// <summary>
/// 鍒濆鍖朠LC杩炴帴
@@ -145,7 +159,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