From ca718bf67886ef08cfd22599d22d458b610c02aa Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 10 七月 2020 18:34:43 +0800
Subject: [PATCH] 板卡添加轴状态和轴报警信息输出
---
src/Bro.M071.Process/M071Process.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index badeebd..c3c2e4f 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -50,6 +50,8 @@
base.Open();
+ InitialMotionCardBaseAxisAlarm();
+
SwitchBeep(false);
SwitchLightGreen(false);
SwitchLightRed(false);
@@ -57,6 +59,21 @@
Reset(null, null, null);
FullReset(null);
+ }
+
+ private void InitialMotionCardBaseAxisAlarm()
+ {
+ if (outputCtrlCard != null)
+ {
+ outputCtrlCard.OnAxisAlarmRaised -= MotionCard_OnAxisAlarmRaised;
+ outputCtrlCard.OnAxisAlarmRaised += MotionCard_OnAxisAlarmRaised;
+ }
+ }
+
+ private void MotionCard_OnAxisAlarmRaised(int axisIndex, string alarmMsg)
+ {
+ RaisedAlarm(alarmMsg);
+ MachineState = MachineState.Alarm;
}
private void InitialSetting()
@@ -472,7 +489,7 @@
{
foreach (var keyValue in keyUnit.MeasureValueDict)//鑾峰彇鍗曚釜閿殑鍗曚釜娴嬮噺item 缁撴灉
{
- bool isExist = keyUnitDatas.FirstOrDefault(u => u.Key == keyUnit.Key && u.MeasurementItem == keyValue.Key) != null;
+ bool isExist = keyUnitDatas.Any(u => u.Key == keyUnit.Key && u.MeasurementItem == keyValue.Key);
if (!isExist)//宸插瓨鍦� 涓嶉噸澶嶆坊鍔犲師濮嬫暟鎹�
{
KeyUnitData keyUnitData = new KeyUnitData();
@@ -503,6 +520,9 @@
private async void ExportProductionExcel(ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet)
{
+ if (!Config.IsCSVOutputEnabled)
+ return;
+
await Task.Run(() =>
{
ExcelExportSet excelExportDto = new ExcelExportSet();
@@ -527,7 +547,7 @@
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;
byte[] filecontent = ExcelExportHelper.ExportExcel(excelExportDto, false);
- string dir = Path.Combine(Config.ResultDataSaveFolder, DateTime.Now.ToString("yyyyMMdd"));
+ string dir = Path.Combine(Config.LogPath, DateTime.Now.ToString("yyyyMMdd"));
if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
--
Gitblit v1.8.0