From 1afe548ac40cc7f975917ef9bf2e156595cf81f3 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 16 四月 2026 08:58:04 +0800
Subject: [PATCH] 优化；
---
Plugin.TestResult/ViewControl.xaml.cs | 473 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 352 insertions(+), 121 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index ea740a9..d7e2f96 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -1,16 +1,22 @@
锘縰sing HMI.Base;
+using HMI.Core.Api;
+using HMI.Core.Entity;
+using HMI.Core.Manager;
+using HMI.Core.Setting;
using HMI.Core.Util;
-using HMI.ParameterManage.Entity;
-using HMI.ParameterManage.Util;
+using HMI.LogUtil;
+using HMI.StdControl;
using HMI.UI.Util;
using log4net;
using NationalInstruments.TestStand.Interop.API;
using NationalInstruments.TestStand.Interop.UI.Ax;
-using Plugin.TestResult_WPF.Model;
-using Plugin.TestResult_WPF.Util;
+using PLCHelper;
+using Plugin.TestResult.Util;
+using Plugin.TsSupport;
using System;
using System.Collections.Generic;
-using System.Linq;
+using System.ComponentModel;
+using System.IO;
using System.Windows;
using System.Windows.Controls;
@@ -19,22 +25,10 @@
/// <summary>
/// ViewControl.xaml 鐨勪氦浜掗�昏緫
/// </summary>
- public partial class ViewControl : PluginControl
+ public partial class ViewControl : PluginMaskControl, IAlarmHandler
{
- private CommonCodeParser codeParser = new CommonCodeParser();
- private double TestTemperature = 60;
- private int TestTime = 3600;
- private double SaftyTemperature = 40;
- private double TestVoltage = 12;
- private double Time_Heating_Low = 300;
- private double Time_Heating_High = 2400;
- private string testSeqFile;
- private Scanner scannerWindow1;
- private Scanner scannerWindow2;
- /// <summary>
- /// 娴嬭瘯搴忓垪鎿嶄綔鍙ユ焺
- /// </summary>
- private SequenceContext SequenceContext = null;
+
+ private System.Timers.Timer timer;
public static ILog Logger { get; private set; }
@@ -55,19 +49,161 @@
set => Set(ref _produceStatus, value);
}
+ private string _fileName;
+
+ public string FileName
+ {
+ get => _fileName;
+ set => Set(ref _fileName, value);
+ }
+
+ private bool enableManualDebug;
+ public bool EnableManualDebug
+ {
+ get => enableManualDebug;
+ set
+ {
+ if (IsRunning)
+ {
+ MsgBoxHelper2.Warn("璇峰厛缁撴潫鑷姩娴嬭瘯");
+ return;
+ }
+ testResultView.inManualDebugMode = value;
+ Set(ref enableManualDebug, value);
+ }
+ }
+
public override void SetLogger(ILog logger)
{
base.SetLogger(logger);
Logger = logger;
}
+ private bool isRunning = false;
+ public bool IsRunning
+ {
+ get => isRunning;
+ set
+ {
+ Set(ref isRunning, value);
+ testResultView.IsRunning = value;
+ this.modelSelect.IsEnabled = !value;
+ this.btnStop.IsEnabled = value;
+ stdEnableMes.CbEnabled = !value;
+ }
+ }
+
+ private bool AutoExecuteSeq = true;
+
+ #region TS鐩稿叧
+
+ /// <summary>
+ /// 娴嬭瘯搴忓垪鎿嶄綔鍙ユ焺
+ /// </summary>
+ private SequenceContext SequenceContext = null;
+ #endregion
+
public ViewControl()
{
+ S7Context.Init(SystemSetting.Instance.PlcIp, SystemSetting.Instance.PlcPort);
DataContext = this;
+ timer = new System.Timers.Timer();
+ timer.Interval = 1000;
+ timer.Elapsed += Timer_Elapsed;
InitializeComponent();
- testResultView.testApp.ExitApplication += new EventHandler(this.axApplicationMgr_ExitApplication);
- testResultView.testApp.UIMessageEvent += new _ApplicationMgrEvents_UIMessageEventEventHandler(this.axApplicationMgr_UIMessageEvent);
- testResultView.testApp.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
+
+ if (testResultView.executionWrapper is TsExecutionWrapper tsWrapper)
+ {
+ tsWrapper.AxApplicationMgr.ExitApplication += new EventHandler(this.axApplicationMgr_ExitApplication);
+ tsWrapper.AxApplicationMgr.UIMessageEvent += new _ApplicationMgrEvents_UIMessageEventEventHandler(this.axApplicationMgr_UIMessageEvent);
+ tsWrapper.AxApplicationMgr.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
+ }
+
+
+ //testResultView.testApp.ExitApplication += new EventHandler(this.axApplicationMgr_ExitApplication);
+ //testResultView.testApp.UIMessageEvent += new _ApplicationMgrEvents_UIMessageEventEventHandler(this.axApplicationMgr_UIMessageEvent);
+ //testResultView.testApp.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
+ }
+
+ private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+ {
+ testResultView.RefreshCooler();
+ }
+
+ public TestResultView View
+ {
+ get => testResultView;
+ }
+ public static string SannerIniFile { get; private set; }
+
+ public override void InitFinish()
+ {
+ base.InitFinish();
+ string path = Path.Combine(BaseFolder, "Count.ini");
+ testResultView.SetCountIniPath(path);
+ testResultView.InitMainGrid();
+ testResultView.InitTestStandEngine();
+
+ path = Path.Combine(BaseFolder, "Scanner.ini");
+ if (!File.Exists(path))
+ {
+ File.Create(path).Close();
+ }
+ SannerIniFile = path;
+ LoadProduct();
+ var api = S7Context.Get(RunTimeVariablePool.DEFAULT_PLC_NAME);
+ log.Debug($"PLC {api.IpAddress}:{api.Port}");
+ try
+ {
+ var value = ParameterManager.GetCommonParameterByName("AutoExecuteSeq");
+ AutoExecuteSeq = bool.Parse(value.Value);
+ }
+ catch
+ {
+ AutoExecuteSeq = true;
+ }
+
+ try
+ {
+ var value = ParameterManager.GetCommonParameterByName("BurnInMainSeq");
+ testResultView.testSeqFile = value.Value;
+ FileName = Path.GetFileName(value.Value);
+ }
+ catch
+ {
+ testResultView.testSeqFile = string.Empty;
+ FileName = string.Empty;
+ }
+ RefreshUIConfig();
+ }
+
+ /// <summary>
+ /// 鍒锋柊UI閰嶇疆
+ /// </summary>
+ private void RefreshUIConfig()
+ {
+ try
+ {
+ /// 杩愯涓氨涓嶇
+ if (IsRunning)
+ {
+ return;
+ }
+ bool enableManualDebug = ParameterManager.GetCommonParameterByName("EnableManualDebug", false);
+ if (enableManualDebug)
+ {
+ FgEnableManualDebug.Visibility = Visibility.Visible;
+ }
+ else
+ {
+ FgEnableManualDebug.Visibility = Visibility.Collapsed;
+ EnableManualDebug = false;
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error("RefreshUIConfig Error.", ex);
+ }
}
private void axApplicationMgr_ExitApplication(object sender, EventArgs e)
@@ -85,6 +221,21 @@
int EventCase = Convert.ToInt32(e.uiMsg.Event);
int MethodCode = Convert.ToInt16(e.uiMsg.NumericData);
string strData;
+
+ try
+ {
+ log.Debug($"EventCase: {EventCase}, MethodCode: {MethodCode}, StrData: {e.uiMsg.StringData}");
+ }
+ catch
+ {
+
+ }
+
+ if (EventCase == 8)
+ {
+ IsRunning = false;
+ return;
+ }
if (EventCase != 10014) return;
@@ -116,41 +267,71 @@
{ }
}
+ private bool isLoaded;
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
- LoadProduct();
- testResultView.InitTestStandEngine();
- Start_Click(null, null);
+ AlarmShowHelper.AddHandler(this);
+ if (AutoExecuteSeq)
+ {
+ ShowMask(() =>
+ {
+ Dispatcher.BeginInvoke(new Action(() =>
+ {
+ Start_Click(null, null);
+ }), System.Windows.Threading.DispatcherPriority.Background);
+ }, (ex) =>
+ {
+ ToastHelper.Error("Loaded Failed.");
+ log.Error("Loaded Failed.", ex);
+ }, "璇风◢鍚�", LangUtil.Get("Ts.SequenceIsStarting"));
+ }
+ else
+ {
+ IsRunning = false;
+ }
Loaded -= UserControl_Loaded;
}
public void LoadProduct()
{
- List<ProductData> products = ParameterManager.GetProducts();
+ List<ProductData> products = ProductManager.GetProducts<List<ProductData>>()
+ ?? new List<ProductData>();
this.modelSelect.Items.Clear();
+ List<string> productSource = new List<string>();
foreach (var prd in products)
{
this.modelSelect.Items.Add(prd.Name);
+ productSource.Add(prd.Name);
}
- if (products.Count > 0)
- {
- this.modelSelect.SelectedIndex = 0;
- }
+ testResultView.SetProductSource(productSource);
+ testResultView.SetCurrentProduct(null);
+
+ //string model = testResultView.executionWrapper.GetStationGlobalValue<string>("ProductModel", 1);
+ ////testResultView.engine.Globals.GetValString("ProductModel", 1);
+ //if (!string.IsNullOrEmpty(model))
+ //{
+ // this.modelSelect.SelectedItem = model;
+ // testResultView.SetCurrentProduct(model);
+ //}
+ //else if (products.Count > 0)
+ //{
+ // this.modelSelect.SelectedIndex = 0;
+ // testResultView.SetCurrentProduct(products[0].Name);
+ //}
}
private void modelSelect_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
try
{
- List<ParameterData> parameters = ParameterManager.GetParametersByProductName(this.modelSelect.SelectedItem.ToString());
- //MessageBox.Show("ParaFile:" + ParaFile + "ParaCount:" + this.parameterManager.Parameters.Count.ToString());
- //this.TestTemperature = Convert.ToDouble(this.parameterManager.Find("TestTemperature").ParmValue);
- //this.TestTime = Convert.ToInt32(this.parameterManager.Find("TestTime").ParmValue);
- //this.TestVoltage = Convert.ToDouble(this.parameterManager.Find("TestVoltage").ParmValue);
- //this.SaftyTemperature = Convert.ToDouble(this.parameterManager.Find("SaftyTemperature").ParmValue);
- //this.Time_Heating_Low = Convert.ToDouble(this.parameterManager.Find("Time_Heat_Low").ParmValue);
- //this.Time_Heating_High = Convert.ToDouble(this.parameterManager.Find("Time_Heat_High").ParmValue);
- testResultView.testSeqFile = parameters.FirstOrDefault(p => p.Name == "TestSequence")?.Value;
+ string currentModel = this.modelSelect.SelectedItem.ToString();
+ List<ParameterData> parameters = ProductManager.GetParametersByProductName(currentModel);
+
+ testResultView.executionWrapper.SetStationGlobalValue<string>("ProductModel", 0, currentModel);
+ testResultView.executionWrapper.CommitToDisk(false);
+
+ //testResultView.engine.Globals.SetValString("ProductModel", 0, currentModel);
+ //testResultView.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
}
catch (Exception ex)
{
@@ -162,10 +343,29 @@
{
try
{
- testResultView.StartTestSequence();
- this.modelSelect.IsEnabled = false;
- this.btnStart.IsEnabled = false;
- this.btnStop.IsEnabled = true;
+ if (string.IsNullOrEmpty(testResultView.testSeqFile))
+ {
+ MsgBoxHelper2.Warn("璇峰厛璁剧疆BurnInMainSeq灞炴��!");
+ IsRunning = false;
+ return;
+ }
+ LogHelper.Info("UI", "鎬诲惎鍔ㄦ寜閽寜涓�", out _);
+ log.Info("鎬诲惎鍔ㄦ寜閽寜涓�");
+ ShowMask(() =>
+ {
+ testResultView.StartTestSequence();
+ Dispatcher.Invoke(() =>
+ {
+ IsRunning = true;
+ });
+ }, (ex) =>
+ {
+ log.Error("StartTestSequence Error.", ex);
+ Dispatcher.Invoke(() =>
+ {
+ MsgBoxHelper.Error(Window.GetWindow(this), $"{this.lang("Ts.StartTestSequenceFailed")}: {ex.Message}");
+ });
+ }, null, "璇风◢鍚�...");
}
catch (Exception ex)
{
@@ -179,10 +379,31 @@
{
try
{
+ bool breakStop = false;
+ foreach (var oven in TestResultView.tables)
+ {
+ if (oven.IsTesting)
+ {
+ breakStop = true;
+ break;
+ }
+ }
+ if (breakStop)
+ {
+ MsgBoxHelper2.Warn(this.lang("Tr.OvenIsTesting"));
+ return;
+ }
+
+ if (MsgBoxHelper2.WarnChoose(this.lang("Tr.MakeSureStopAllTest")) != MessageBoxResult.OK)
+ {
+ return;
+ }
+
+ LogHelper.Info("UI", "鎬诲仠姝㈡寜閽寜涓�", out _);
+ log.Info("鎬诲仠姝㈡寜閽寜涓�");
testResultView.StopTest();
- this.modelSelect.IsEnabled = true;
- this.btnStart.IsEnabled = true;
- this.btnStop.IsEnabled = false;
+ /// 宸茬粡鍔犱簡WaitForExit,杩欓噷鍙互鏀逛负false
+ IsRunning = false;
}
catch (Exception ex)
{
@@ -192,84 +413,94 @@
}
}
- private void Scan_Click_1(object sender, RoutedEventArgs e)
- {
- if (scannerWindow1 == null)
- {
- scannerWindow1 = new Scanner(this.lang("Tr.Zone1Scan"))
- {
- Tag = "Zone1"
- };
- scannerWindow1.FinishBarcode += ScannerWindow_FinishBarcode;
- //scannerWindow1.Owner = Window.GetWindow(this);
- scannerWindow1.Closed += ScannerWindow1_Closed;
- scannerWindow1.Show();
- }
- else
- {
- scannerWindow1.Activate();
- }
- }
-
- private void Scan_Click_2(object sender, RoutedEventArgs e)
- {
- if (scannerWindow2 == null)
- {
- scannerWindow2 = new Scanner(this.lang("Tr.Zone2Scan"))
- {
- Tag = "Zone2"
- };
- scannerWindow2.FinishBarcode += ScannerWindow_FinishBarcode;
- scannerWindow2.Owner = Window.GetWindow(this);
- scannerWindow2.Closed += ScannerWindow2_Closed;
- scannerWindow2.Show();
- }
- else
- {
- scannerWindow2.Activate();
- }
- }
-
- /// <summary>
- /// 鎵爜瀹屾垚閫昏緫
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ScannerWindow_FinishBarcode(object sender, BarcodeEventArg e)
- {
- if (this.SequenceContext == null) return;
- CellInfo cellInfo = codeParser.GetCellInfoByCode(e.positionCode);
-
- string paramName = e.name == "Zone1" ? "StationState.StartScanner_A" : "StationState.StartScanner_B";
- testResultView.engine.Globals.SetValBoolean(paramName, 0, true);
- string positionCode = e.positionCode, snrCode = e.snrCode;
- //闇�瑕佸鍔犳潯鐮佹牎楠屽姛鑳�
-
- //灏嗚鍒扮殑鏉＄爜鍐欏叆鍒癝N涓�
- int dutNo = Convert.ToInt16(positionCode.Split('-')[2]) - 1;
- string LookupStr = e.name == "Zone1" ? $"StationState.SN[{dutNo}]" : $"StationState.SN[{(dutNo + 54)}]";
- //this.SequenceContext.StationGlobals.SetValString(LookupStr, 0, snrCode);
- //string code = this.SequenceContext.StationGlobals.GetValString(LookupStr, 0);
-
- testResultView.engine.Globals.SetValString(LookupStr, 0, snrCode);
- string code = testResultView.engine.Globals.GetValString(LookupStr, 0);
- testResultView.nameTables[cellInfo.OvenName].GetSingleCell(cellInfo.Index).SetStatus("hadCode");
- }
-
- private void ScannerWindow1_Closed(object sender, EventArgs e)
- {
- scannerWindow1 = null;
- }
-
- private void ScannerWindow2_Closed(object sender, EventArgs e)
- {
- scannerWindow2 = null;
- }
-
private void testResultView_Loaded(object sender, RoutedEventArgs e)
{
}
+ /// <summary>
+ /// 璁℃暟娓呴浂鎸夐挳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void BtnClear_Click(object sender, RoutedEventArgs e)
+ {
+ testResultView.ClearNumber();
+ }
+ private void ScannerSetting_Click(object sender, RoutedEventArgs e)
+ {
+ Plugin.TestResult.ScannerSetting setting = new Plugin.TestResult.ScannerSetting()
+ {
+ Owner = Window.GetWindow(this)
+ };
+ setting.Open(false, "Config");
+ }
+
+ private void StdEnableMes_ValueChanged(object sender, StdUIEventArg e)
+ {
+ testResultView.executionWrapper.SetStationGlobalValue<bool>($"SystemSetting.{e.StringValue}", 1, e.BoolValue);
+ //testResultView.SequenceContext?.StationGlobals.SetValBoolean($"SystemSetting.{e.StringValue}", 1, e.BoolValue);
+ }
+
+ public void HandleAlarm(AlarmText alarm)
+ {
+ if (alarm.Level >= 4 && TestResultView.tables != null)
+ {
+ log.Info($"4绾ф姤璀﹁Е鍙�: [{alarm.AlarmInfo}],灏嗗仠姝㈡墍鏈夌倝浣撴祴璇�");
+ foreach (var oven in TestResultView.tables)
+ {
+ testResultView.SetStartFlag(oven.index, false);
+ }
+ return;
+ }
+
+ DataTable targetOven = null;
+ foreach (var oven in TestResultView.tables)
+ {
+ if (alarm.AlarmInfo?.StartsWith(oven.title) == true)
+ {
+ targetOven = oven;
+ break;
+ }
+ }
+ if (targetOven == null)
+ {
+ return;
+ }
+ if (alarm.Level >= 3)
+ {
+ /// 3绾т互涓婄殑鎶ヨ浼氬仠姝㈡祴璇�
+ log.Info($"3绾ф姤璀﹁Е鍙�: [{alarm.AlarmInfo}],灏嗗仠姝㈣�佸寲鐐塠{targetOven.title}]娴嬭瘯");
+ testResultView.SetStartFlag(targetOven.index, false);
+ }
+ }
+
+ public override void Active()
+ {
+ base.Active();
+ LoadProduct();
+ RefreshUIConfig();
+ }
+
+ public override void OnClose(object sender, CancelEventArgs e)
+ {
+ if (IsRunning)
+ {
+ MsgBoxHelper2.Warn("璇峰厛鍋滄鑰佸寲娴嬭瘯锛�");
+ e.Cancel = true;
+ }
+ }
+
+ public override void DoClose(object sender, EventArgs e)
+ {
+ try
+ {
+ timer?.Stop();
+ testResultView.ReleaseResource();
+ }
+ catch
+ {
+ }
+ }
}
}
--
Gitblit v1.9.1