From 1f2fa3f54d4a7b5a2f601c4c947a06476342e3bd Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 22 一月 2021 09:23:06 +0800
Subject: [PATCH] 1. gocator驱动将system.stop移到system.ReceiveData之后 2. 修改测量完成后状态切换逻辑，避免安全光线等干扰 3. 添加设备异常输出日志记录 4. 产品结果输出时做硬盘文件记录
---
src/Bro.M071.Process/M071Converters.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Bro.M071.Process/M071Converters.cs b/src/Bro.M071.Process/M071Converters.cs
index da87fd1..fb8274b 100644
--- a/src/Bro.M071.Process/M071Converters.cs
+++ b/src/Bro.M071.Process/M071Converters.cs
@@ -49,10 +49,10 @@
if (iConfig is M071Config config)
{
- config.SnapshotPointCollection.ForEach(s =>
- {
- table[s.Id] = s.Name;
- });
+ config.SnapshotPointCollection.Where(u => u.IsEnabled).ToList().ForEach(s =>
+ {
+ table[s.Id] = s.Name;
+ });
}
}
@@ -141,7 +141,7 @@
if (iConfig is M071Config config)
{
- var resultIds = config.KeyUnitCollection.Where(u => u.Key == (context.Instance as KeyUnitBind).Key).Select(u => u.KeyResult).ToList();
+ var resultIds = config.KeyUnitCollection.Where(u => u.IsEnabled && u.Key == (context.Instance as KeyUnitBind).Key).Select(u => u.KeyResultId).ToList();
var result = config.KeyResultCollection.Where(u => resultIds.Contains(u.Id)).SelectMany(u => u.Results).ToList();
@@ -149,10 +149,10 @@
{
result.ForEach(r =>
{
- table[r] = r;
+ table.Add(r, r);
});
- table[""] = "";
+ table.Add("All", "All");
}
}
}
@@ -181,7 +181,7 @@
if (iConfig is M071Config config)
{
- return new StandardValuesCollection(config.MeasureSpecCollection.Select(u => u.Code).ToList());
+ return new StandardValuesCollection(config.MeasureTypeCollection.Select(u => u.Code).ToList());
}
}
--
Gitblit v1.8.0