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.UI.Config/MainFrm.cs | 102 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 97 insertions(+), 5 deletions(-)
diff --git a/src/Bro.UI.Config/MainFrm.cs b/src/Bro.UI.Config/MainFrm.cs
index 39c3169..1d27f20 100644
--- a/src/Bro.UI.Config/MainFrm.cs
+++ b/src/Bro.UI.Config/MainFrm.cs
@@ -157,14 +157,20 @@
CloseAllDeviceFrm();
LoadDevices();
- foreach (var dock in dockPanelMain.Contents)
+ try
{
- MenuFrmBase m = dock as MenuFrmBase;
-
- if (m != null && m.Id != frmId)
+ foreach (var dock in dockPanelMain.Contents)
{
- m.DownloadProcess(process);
+ MenuFrmBase m = dock as MenuFrmBase;
+
+ if (m != null && m.Id != frmId)
+ {
+ m.DownloadProcess(process);
+ }
}
+ }
+ catch (Exception ex)
+ {
}
});
}
@@ -264,7 +270,85 @@
//{
// wait.SpinOnce();
//}
+
+ LoadProcess();
+
LoadLayoutFromXML(m_deserializeDeviceRunFrm);
+
+ LoadProcess(false);
+ }
+
+ private List<string> LoadProcessCode()
+ {
+ var systemProcessCodes = ProcessFactory.GetProcessCodes();
+ var avaiableProcessCodes = SettingHelper.GetProcessCodes();
+
+ List<string> pCodes = new List<string>();
+
+ if (avaiableProcessCodes.Count > 0)
+ {
+ pCodes = avaiableProcessCodes.Intersect(systemProcessCodes).ToList();
+ }
+ else
+ {
+ pCodes = systemProcessCodes;
+ }
+
+ return pCodes;
+ }
+
+ private List<string> LoadProductionCode()
+ {
+ return SettingHelper.GetProductionCodes();
+ }
+
+ private void LoadProcess(bool isInitialProcess = true)
+ {
+ if (isInitialProcess)
+ {
+ _process = ProcessFactory.CreateStationProcess(LoadProcessCode()[0], LoadProductionCode()[0], out string msg);
+
+ if (!string.IsNullOrWhiteSpace(msg))
+ {
+ _process = null;
+ //LogAsync(DateTime.Now, "Process鍒涘缓澶辫触", $"{msg}");
+ throw new ProcessException($"Process鍒涘缓澶辫触,{msg}", null, ExceptionLevel.Fatal);
+ }
+
+
+ _process.InitialProcess("");
+ }
+ _process.OnLog -= OnProcessLogOutput;
+ _process.OnLog += OnProcessLogOutput;
+
+ _process.OnAlarmUpdate -= Process_OnAlarmUpdate;
+ _process.OnAlarmUpdate += Process_OnAlarmUpdate;
+
+ //CloseAllDeviceFrm();
+ LoadDevices();
+
+ try
+ {
+ foreach (var dock in dockPanelMain.Contents)
+ {
+ //MenuFrmBase m = dock as MenuFrmBase;
+
+ //m.DownloadProcess(_process);
+
+ if (dock is MenuFrmBase menuFrm)
+ {
+ menuFrm.DownloadProcess(_process);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ }
+
+ private void OnProcessLogOutput(DateTime dt, string prefix, string msg)
+ {
+ DockFrm_OnLogMsgOutput(new LogMsg(dt, prefix, msg));
}
private void CloseAllDocuments()
@@ -287,6 +371,11 @@
private void MainFrm_FormClosing(object sender, FormClosingEventArgs e)
{
+ try
+ {
+ _process?.Close();
+ }
+ catch { }
CloseAllDocuments();
}
@@ -423,6 +512,9 @@
if (u == null)
return;
+ if (_process.DeviceCollection.Any(d => d.Id == u.Device.Id))
+ return;
+
u.DockPanel = null;
u.Close();
});
--
Gitblit v1.8.0