From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
Plugin.TestResult/DataTable.xaml.cs | 402 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 346 insertions(+), 56 deletions(-)
diff --git a/Plugin.TestResult/DataTable.xaml.cs b/Plugin.TestResult/DataTable.xaml.cs
index 200341f..1ac79ce 100644
--- a/Plugin.TestResult/DataTable.xaml.cs
+++ b/Plugin.TestResult/DataTable.xaml.cs
@@ -1,15 +1,18 @@
-锘縰sing HMI.Core.Util;
+锘縰sing HMI.Core.Setting;
+using HMI.Core.Util;
+using HMI.UI.Util;
using HMI.Util;
using Plugin.TestResult;
+using Plugin.TestResult.Util;
using Plugin.TestResult_WPF.Model;
-using Plugin.TestResult_WPF.Util;
+using SuperSocket.SocketBase.Config;
using SuperSocket.SocketBase.Protocol;
using System;
-using System.CodeDom.Compiler;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Runtime.CompilerServices;
+using System.Timers;
using System.Windows;
using System.Windows.Controls;
@@ -51,6 +54,24 @@
set => RaiseAndSetIfchanged(ref _statusText, value);
}
+ private bool _isTesting;
+
+ public bool IsTesting
+ {
+ get { return _isTesting; }
+ set => RaiseAndSetIfchanged(ref _isTesting, value);
+ }
+
+ private ushort coolerStatus;
+ public ushort CoolerStatus
+ {
+ get => coolerStatus;
+ set
+ {
+ RaiseAndSetIfchanged(ref coolerStatus, value);
+ }
+ }
+
private string tcpServerStatus;
public string TcpServerStatus
@@ -66,20 +87,22 @@
get { return tcpServerInfo; }
set { RaiseAndSetIfchanged(ref tcpServerInfo, value); }
}
-
- private static CommonCodeParser codeParser = new CommonCodeParser();
- private readonly int index;
+ public int index { get; private set; }
private readonly int cellCount;
private readonly string chartTitle;
private readonly TestResultView parent;
private BaseConfig config;
- private Chart chart;
- private Chart multiChart;
- private SingleCell[] cells;
+ private LiveChart chart;
+ private LiveChart multiChart;
+ public SingleCell[] cells { get; private set; }
private TcpServer tcpServer;
private string CountIniPath;
+
+ private DateTime? testStartTime;
+
+ private Timer testTimeTimer;
// 骞冲潎娓╁害
public List<double> tempratures = new List<double>();
@@ -97,12 +120,12 @@
this.title = title;
this.cellCount = config.PositionCount;
this.cells = new SingleCell[cellCount];
- this.chartTitle = config.MainChartTitle;
+ this.chartTitle = this.lang("Tr.AvgTemp");
DataContext = this;
InitializeComponent();
mainGrid.Columns = config.PositionColumn;
- this.chart = new Chart(this.chartTitle, false, config.MaxSize, config.RefreshInterval);
- this.multiChart = new Chart(config.DetailChartTitle, true, config.MaxSize, config.RefreshInterval)
+ this.chart = new LiveChart("骞冲潎娓╁害,骞冲潎娓╁害(鈩�)", false, true);
+ this.multiChart = new LiveChart(",璇︾粏娓╁害(鈩�)", true)
{
BorderThickness = new Thickness(0)
};
@@ -112,11 +135,33 @@
for (int i = 0; i < this.cellCount; i++)
{
- var cell = new SingleCell(title, i, config.CellListMaxSize, countIniPath);
+ var cellRow = (i / config.PositionColumn) + 1;
+ var cellCol = (i % config.PositionColumn) + 1;
+ var cellTitle = $"{title}-{cellRow}-{cellCol}";
+
+ var cell = new SingleCell(this, cellTitle, i, config.CellListMaxSize, countIniPath);
mainGrid.Children.Add(cell);
cells[i] = cell;
}
+
+ ScannerParser.Init(config.CodeParserType);
+
ReadCount();
+ testTimeTimer = new Timer();
+ testTimeTimer.Interval = 10000;
+ testTimeTimer.AutoReset = true;
+ testTimeTimer.Elapsed += TestTimeTimer_Elapsed;
+ if (!ParamSetting.ShowCoolerSetting) coolerSetting.Visibility = Visibility.Collapsed;
+ }
+
+ private void TestTimeTimer_Elapsed(object sender, ElapsedEventArgs e)
+ {
+ if (testStartTime == null) return;
+ var now = DateTime.Now;
+ Dispatcher.BeginInvoke(new Action(() =>
+ {
+ //SetConsumeTime((now - testStartTime).Value.TotalSeconds);
+ }));
}
public int GetSize()
@@ -138,28 +183,65 @@
{
infoTable.temperature = t;
tempratures.Add(t);
- chart.AddData(t);
+ chart.AddDynamicData("骞冲潎娓╁害", "骞冲潎娓╁害(鈩�)", DateTime.Now, t);
}
public void SetTemperature(string name, double t)
{
- List<double> list;
- if (detailTempratures.ContainsKey(name))
- {
- list = detailTempratures[name];
- }
- else
- {
- list = new List<double>();
- detailTempratures.Add(name, list);
- }
- list.Add(t);
- multiChart.AddData(name, t);
+ //List<double> list;
+ //if (detailTempratures.ContainsKey(name))
+ //{
+ // list = detailTempratures[name];
+ //}
+ //else
+ //{
+ // list = new List<double>();
+ // detailTempratures.Add(name, list);
+ //}
+ //list.Add(t);
+
+ multiChart.AddDynamicData(name, "璇︾粏娓╁害(鈩�)", DateTime.Now, t);
+ //multiChart.AddData(name, t);
}
public void SetStatus(string status)
{
- infoTable.status = status;
+ ViewControl.Logger.Debug($"In Status: {status}");
+ Dispatcher.BeginInvoke(new Action(() =>
+ {
+ var lastStatus = infoTable.status;
+ if (status == "preCheck")
+ {
+ ViewControl.Logger.Debug($"In preCheck");
+ IsTesting = true;
+ return;
+ }
+ if (status == "stop")
+ {
+ IsTesting = false;
+ return;
+ }
+ if (status == "abort")
+ {
+ IsTesting = false;
+ }
+ infoTable.status = status;
+
+ //if (lastStatus != "testing" && status == "testing")
+ //{
+ // testStartTime = DateTime.Now;
+ // SetStartTime(testStartTime?.ToString("yyyy-MM-dd HH:mm:ss"));
+ // testTimeTimer.Start();
+ //}
+ //if (lastStatus == "testing" && status != "testing")
+ //{
+ // testTimeTimer.Stop();
+ // var now = DateTime.Now;
+ // infoTable.UpdateConsumeTime((now - testStartTime).Value.TotalSeconds, null);
+ // SetEndTime(now.ToString("yyyy-MM-dd HH:mm:ss"));
+ // testStartTime = null;
+ //}
+ }));
}
public void SetOkCount(int count)
@@ -182,9 +264,9 @@
infoTable.endTimeStr = endTime;
}
- public void SetConsumeTime(double consumeTime)
+ public void UpdateConsumeTime(double consumeTime, double? leftTime)
{
- infoTable.consumeTime = consumeTime;
+ infoTable.UpdateConsumeTime(consumeTime, leftTime);
}
private ChartWindow window;
@@ -215,26 +297,57 @@
private void SetStationGlobal_Click(object sender, RoutedEventArgs e)
{
- ClearChartData();
- parent.SetStartFlag(this.index, true);
+
+ }
+
+ private void StartSingleClick(object sender, RoutedEventArgs e)
+ {
+ if (IsTesting)
+ {
+ if (MsgBoxHelper2.WarnChoose(this.lang("Tr.MakeSureStopOvenTest", title)) == MessageBoxResult.OK)
+ {
+ parent.SetStartFlag(this.index, false);
+ }
+ }
+ else
+ {
+ ClearChartData();
+ parent.SetStartFlag(this.index, true);
+ }
}
private void ScanWindow_Click(object sender, RoutedEventArgs e)
{
+ if (!parent.IsRunning)
+ {
+ MsgBoxHelper.WarnMessage(this, this.lang("Tr.StartSeqFirst"), null, MessageBoxButton.OK);
+ return;
+ }
+
if (scanner != null)
{
- scanner.Activate();
+ scanner.ShowDialog();
}
else
{
- scanner = new Scanner(this.lang("Tr.ScanTitle", title))
+ int rows = config.CellCount / config.PositionColumn + 1;
+ scanner = new Scanner(this.index, this.lang("Tr.ScanTitle", title), CbProduct.SelectedItem?.ToString(), mainGrid.Columns, rows)
{
+ Owner = Window.GetWindow(this),
Tag = title
};
scanner.FinishBarcode += Scanner_FinishBarcode;
+ scanner.ComplateClick += Scanner_ComplateClick; ;
scanner.Closed += Scanner_Closed;
- scanner.Show();
+ scanner.ShowDialog();
}
+ }
+
+ private void Scanner_ComplateClick(object sender, RoutedEventArgs e)
+ {
+ string paramName = $"StationState.Scanner[{index}]";
+ parent.engine.Globals.SetValBoolean(paramName, 1, true);
+ //parent.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
}
private void Scanner_Closed(object sender, EventArgs e)
@@ -245,23 +358,60 @@
private void Scanner_FinishBarcode(object sender, BarcodeEventArg e)
{
if (parent.SequenceContext == null) return;
- CellInfo cellInfo = codeParser.GetCellInfoByCode(e.positionCode);
- string paramName = $"StationState.StartScanner_{title}";
- parent.engine.Globals.SetValBoolean(paramName, 0, true);
+ int rows = (config.CellCount / config.PositionColumn) + 1;
+ CellInfo cellInfo = ScannerParser.GetCellInfoByCode(CbProduct.SelectedItem?.ToString(), mainGrid.Columns, rows, e.positionCode);
string positionCode = e.positionCode, snrCode = e.snrCode;
- //TODO 闇�瑕佸鍔犳潯鐮佹牎楠屽姛鑳�
//灏嗚鍒扮殑鏉＄爜鍐欏叆鍒癝N涓�
- int dutNo = Convert.ToInt16(positionCode.Split('-')[2]) - 1;
- dutNo = this.index * this.cellCount + dutNo;
+ int dutNo = this.index * this.cellCount + cellInfo.Index;
string LookupStr = $"StationState.SN[{dutNo}]";
+ cellInfo.LookUpStr = LookupStr;
- parent.engine.Globals.SetValString(LookupStr, 0, snrCode);
+ ViewControl.Logger.Debug($"PositionCode: [{e.positionCode}], SNR: [{e.snrCode}], LookUpStr: [{LookupStr}]");
+ ViewControl.Logger.Debug($"OvenName: [{cellInfo.OvenName}], CellIndex: [{cellInfo.Index}]");
+ var cell = TestResultView.nameTables[cellInfo.OvenName].GetSingleCell(cellInfo.Index);
+ if (snrCode == null)
+ {
+ var oldCellInfo = e.lastInfo;
+ var oldCell = TestResultView.nameTables[oldCellInfo.OvenName].GetSingleCell(oldCellInfo.Index);
+ if (oldCell.status != "hadCode")
+ {
+ throw new Exception(this.lang("Tr.PositionCantClearSNR", oldCellInfo.OriginCode));
+ }
+ // 绉婚櫎鏉＄爜
+ parent.engine.Globals.SetValString(oldCellInfo.LookUpStr, 1, "");
+ parent.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
+
+ oldCell.SetStatus("waiting");
+ oldCell.ClearSN();
+ return;
+ }
+
+ /// 娓呮帀涓婁釜鏉＄爜鐨勮褰�
+ var lastSn = cell.sn;
+ if (!string.IsNullOrEmpty(lastSn))
+ {
+ Scanner.RemoveSNR(lastSn);
+ }
+
+ // 鍐欏叆鏉＄爜
+ parent.engine.Globals.SetValString(LookupStr, 1, snrCode);
parent.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
- string code = parent.engine.Globals.GetValString(LookupStr, 0);
- parent.nameTables[cellInfo.OvenName].GetSingleCell(cellInfo.Index).SetStatus("hadCode");
+
+ TestResultView.nameTables[cellInfo.OvenName].GetSingleCell(cellInfo.Index).SetStatus("hadCode");
+ TestResultView.nameTables[cellInfo.OvenName].GetSingleCell(cellInfo.Index).sn = snrCode;
+ Scanner.InsertNewCode(snrCode, cellInfo);
+ var light = $"Oven{this.index + 1}_Cell{cell.index + 1}_Light_OK";
+ if (cell.LightGreen(true, out string msg))
+ {
+ ViewControl.Logger.Debug($"Open Light [{light}] ON.");
+ }
+ else
+ {
+ ViewControl.Logger.Debug($"Open Light [{light}] Error.{msg}");
+ }
}
@@ -282,13 +432,18 @@
/// </summary>
private void StartTcpServer()
{
+ var serverConfig = new ServerConfig()
+ {
+ MaxRequestLength = 1024 * 1024,
+ Port = config.PortStart + index
+ };
try
{
if (tcpServer == null)
{
tcpServer = new TcpServer();
tcpServer.NewRequestReceived += TcpServer_NewRequestReceived;
- if (!tcpServer.Setup(config.PortStart + index))
+ if (!tcpServer.Setup(serverConfig))
{
ChangeTcpServerStatus("ERROR", this.lang("Tr.TcpServer.SettingFailed"));
return;
@@ -302,7 +457,7 @@
}
else if (tcpServer.State != SuperSocket.SocketBase.ServerState.Running)
{
- if (!tcpServer.Setup(config.PortStart + index))
+ if (!tcpServer.Setup(serverConfig))
{
ChangeTcpServerStatus("ERROR", this.lang("Tr.TcpServer.SettingFailed"));
return;
@@ -358,6 +513,7 @@
/// </summary>
public void RelaseResource()
{
+ testTimeTimer?.Stop();
StopTcpServer();
}
@@ -369,6 +525,7 @@
private void TcpServer_NewRequestReceived(TcpSession session, StringRequestInfo requestInfo)
{
string msg = requestInfo.Body;
+ ViewControl.Logger.Debug($"TCP Data From {session.RemoteEndPoint}: {msg}.");
string[] datas_10015 = msg.Split(';');
int cellIndex = int.Parse(datas_10015[1]);
@@ -381,10 +538,11 @@
{
step = values[0],
value = values[1],
- result = values[2],
- range = values[3],
- condition = values[4],
- updateTime = values[5]
+ limitUp = values[2],
+ limitDown = values[3],
+ unit = values[4],
+ result = values[5],
+ updateTime = values[6]
});
//session.Send("1");
}
@@ -392,10 +550,18 @@
public void RefreshCount(int ok, int ng)
{
infoTable.UpdateNumber(infoTable.okCount + ok, infoTable.ngCount + ng);
- IniFileHelper.WriteIniData($"Oven_{index}", "Pass", infoTable.okCount.ToString(),
- this.CountIniPath);
- IniFileHelper.WriteIniData($"Oven_{index}", "Fail", infoTable.ngCount.ToString(),
- this.CountIniPath);
+
+ if (ParamSetting.ProbeByModel)
+ {
+
+ }
+ else
+ {
+ IniFileHelper.WriteIniData($"Oven_{index}", "Pass", infoTable.okCount.ToString(),
+ this.CountIniPath);
+ IniFileHelper.WriteIniData($"Oven_{index}", "Fail", infoTable.ngCount.ToString(),
+ this.CountIniPath);
+ }
}
/// <summary>
@@ -451,7 +617,7 @@
using (FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write))
using (StreamWriter sw = new StreamWriter(fs, System.Text.Encoding.UTF8))
{
- string title = string.Join(",", detailTempratures.Keys) + ",骞冲潎鍊�";
+ string title = string.Join(",", detailTempratures.Keys) + "," + this.lang("Tr.AvgTemp");
sw.WriteLine(title);
for (int i = 0; i < tempratures.Count; i++)
@@ -500,15 +666,45 @@
{
parent.SetOvenProduct(index, "");
}
+
+ foreach (var cell in cells)
+ {
+ cell.RefreshProbe();
+ cell.RefreshCharts();
+ }
}
- public void ClearElectricData()
+ public void ClearCellData()
{
foreach (var cell in cells)
{
- cell.ClearElectricData();
+ cell.ClearChart();
}
}
+
+ //public void ClearElectricData()
+ //{
+ // foreach (var cell in cells)
+ // {
+ // cell.ClearElectricData();
+ // }
+ //}
+
+ //public void ClearVData()
+ //{
+ // foreach (var cell in cells)
+ // {
+ // cell.ClearVData();
+ // }
+ //}
+
+ //public void ClearWaterData()
+ //{
+ // foreach (var cell in cells)
+ // {
+ // cell.ClearWaterData();
+ // }
+ //}
private void Button_Click_1(object sender, RoutedEventArgs e)
{
@@ -518,5 +714,99 @@
};
setting.Open(true, this.title);
}
+
+ private void Manual_Cooler_Opt(object sender, RoutedEventArgs e)
+ {
+ //var btn = (Button)sender;
+ //var target = CoolerStatus == 2 ? 0 : 2;
+ //if (MsgBoxHelper2.WarnChoose($"纭畾瑕佽繘琛寋btn.Content}鍚楋紵") == MessageBoxResult.OK)
+ //{
+ // if (S7Context.WriteData("1", $"Oven{index + 1}_CoolerStatus", (ushort)target, out string msg))
+ // {
+ // CoolerStatus = (ushort)target;
+ // ToastHelper.Success("Success");
+ // }
+ // else
+ // {
+ // ToastHelper.Error($"{msg}");
+ // }
+ //}
+ if (parent.IsRunning)
+ {
+ MsgBoxHelper2.Warn(this.lang("Tr.CantOptCooler"));
+ return;
+ }
+ var columns = mainGrid.Columns;
+ var window = new CoolerStatus(this.index, columns, title + this.lang("Tr.CoolerSetting"))
+ {
+
+ Owner = Window.GetWindow(this)
+ };
+ window.ShowDialog();
+ }
+
+ private void ClearAllSnr_Click(object sender, RoutedEventArgs e)
+ {
+ var str = $"StationState.DoorClose[{index}]";
+ if (parent.engine.Globals.GetValBoolean(str, 0) == true)
+ {
+ MsgBoxHelper.Error(Window.GetWindow(this), this.lang("Tr.CantClearSNR"));
+ return;
+ }
+
+ if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), LangUtil.Get("Tr.MakeSureClearAllSNR")) == MessageBoxResult.OK)
+ {
+ try
+ {
+ ClearAllSN();
+ ToastHelper.Success(LangUtil.Get("App.DeleteSuccess"));
+ }
+ catch (Exception ex)
+ {
+ ViewControl.Logger.Error("ClearAllSnr_Click Error.", ex);
+ MsgBoxHelper.Error(Window.GetWindow(this), ex.Message);
+ }
+ }
+ }
+
+ public void ClearAllSN()
+ {
+ for (int i = 0; i < this.cellCount; i++)
+ {
+ ClearCellSN(i);
+ }
+ }
+
+ public void TryClearCellSN(int cellIndex)
+ {
+ var str = $"StationState.DoorClose[{this.index}]";
+ if (parent.engine.Globals.GetValBoolean(str, 0) == true)
+ {
+ MsgBoxHelper.Error(Window.GetWindow(this), this.lang("Tr.CantClearSNR"));
+ return;
+ }
+ ClearCellSN(cellIndex);
+ }
+
+ private void ClearCellSN(int index)
+ {
+ var cell = GetSingleCell(index);
+ int dutNo = this.index * this.cellCount + index;
+ string LookupStr = $"StationState.SN[{dutNo}]";
+ var lastSN = cell.sn;
+ cell.SetStatus("waiting");
+ parent.engine.Globals.SetValString(LookupStr, 1, "");
+ parent.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
+ if (!string.IsNullOrEmpty(lastSN)) Scanner.RemoveSNR(lastSN);
+ cell.ClearSN();
+ }
+
+ private void Button_Click_2(object sender, RoutedEventArgs e)
+ {
+ if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), this.lang("Tr.MakeSureStopOvenTest", title)) == MessageBoxResult.OK)
+ {
+ parent.SetStartFlag(this.index, false);
+ }
+ }
}
}
--
Gitblit v1.9.1