From 30458c0bca8066d98ca901b5065832a44a7e970e Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 16 七月 2020 15:47:22 +0800
Subject: [PATCH] 测量结果 查询+导出功能
---
src/Bro.Common.Device/DeviceBase/PLCBase.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/PLCBase.cs b/src/Bro.Common.Device/DeviceBase/PLCBase.cs
index 0f56fbb..0c44685 100644
--- a/src/Bro.Common.Device/DeviceBase/PLCBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/PLCBase.cs
@@ -122,7 +122,7 @@
//PLCIConfig.MonitorSetCollection.ForEach(set =>
Parallel.ForEach(PLCIConfig.MonitorSetCollection, set =>
{
- MonitorSet monitorSet = set as MonitorSet;
+ PLCMonitorSet monitorSet = set as PLCMonitorSet;
if (monitorSet.TriggerIndex < 0 || monitorSet.TriggerIndex >= tempNew.Count)
{
return;
@@ -153,7 +153,7 @@
private void OnMethodInvoked(IAsyncResult ar)
{
- MonitorSet monitorSet = ar.AsyncState as MonitorSet;
+ PLCMonitorSet monitorSet = ar.AsyncState as PLCMonitorSet;
ProcessResponse resValues = monitorSet.Response;
@@ -211,7 +211,7 @@
}
object _alarmLock = new object();
- private async void SaveAlarmCSVAsync(DateTime now, string plcName, WarningSet ws)
+ private async void SaveAlarmCSVAsync(DateTime now, string plcName, PLCWarningSet ws)
{
await Task.Run(() =>
{
@@ -281,7 +281,7 @@
return locations;
}
- public bool MoveToPoint(IOperationConfig opConfig)
+ public ResponseMessage MoveToPoint(IOperationConfig opConfig)
{
throw new NotImplementedException();
}
@@ -309,14 +309,14 @@
[DisplayName("璀︽姤閰嶇疆")]
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(WarningSetsEditor), typeof(UITypeEditor))]
- public List<WarningSet> WarningSetCollection { get; set; } = new List<WarningSet>();
+ public List<PLCWarningSet> WarningSetCollection { get; set; } = new List<PLCWarningSet>();
#region IMonitorConfig
[Category("鐩戝惉璁剧疆")]
[Description("鐩戝惉鎿嶄綔閰嶇疆闆嗗悎")]
[DisplayName("鐩戝惉閰嶇疆")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(ComplexCollectionEditor<MonitorSet>), typeof(UITypeEditor))]
+ [Editor(typeof(ComplexCollectionEditor<PLCMonitorSet>), typeof(UITypeEditor))]
public List<IMonitorSet> MonitorSetCollection { get; set; } = new List<IMonitorSet>();
[Category("鐩戝惉璁剧疆")]
@@ -481,9 +481,9 @@
}
}
- private List<WarningSet> GetWarningSets()
+ private List<PLCWarningSet> GetWarningSets()
{
- List<WarningSet> wsList = new List<WarningSet>();
+ List<PLCWarningSet> wsList = new List<PLCWarningSet>();
OpenFileDialog ofd = new OpenFileDialog();
ofd.Multiselect = false;
@@ -500,7 +500,7 @@
if (!string.IsNullOrWhiteSpace(list[1]))
{
- WarningSet ws = new WarningSet();
+ PLCWarningSet ws = new PLCWarningSet();
ws.WarningCode = list[0];
ws.WarningDescription = list[1];
@@ -536,7 +536,7 @@
/// <returns></returns>
protected override Type CreateCollectionItemType()
{
- return typeof(WarningSet);
+ return typeof(PLCWarningSet);
}
protected override string GetDisplayText(object value)
--
Gitblit v1.8.0