From aefe9f2572eac7c61f6d2952593ec18a700dfcf0 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期二, 01 六月 2021 11:43:19 +0800
Subject: [PATCH] 1. 上传数据线程部分修改，界面关闭时退出所有相关线程
---
MainForm.cs | 84 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 11 deletions(-)
diff --git a/MainForm.cs b/MainForm.cs
index 726e365..9355a5c 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -203,6 +203,24 @@
CommonUtil.IsRunning = true;
SetControls();
+
+ opc.Write(OPCOutputTag.DetectResult_OK, false);
+ opc.Write(OPCOutputTag.DetectResult_NG, false);
+ CommonUtil.WriteLog(LogType.Inf, "鍒濆鍖栦笅鏂橬A");
+
+ //250琛ㄧず鍚姩鏃堕渶瑕佸ぇ澶嶄綅鎶ヨ
+ opc.Write(OPCOutputTag.Alarm, 250);
+ CommonUtil.WriteLog(LogType.Inf, "杞欢鍚姩澶у浣�");
+
+ string continuousNGStr = ConfigurationManager.AppSettings["ContinuousNGThreshold"];
+ if (int.TryParse(continuousNGStr, out int temp))
+ {
+ _continuousNGThreshold = temp;
+ }
+ else
+ {
+ _continuousNGThreshold = 999;
+ }
}
public void Stop()
@@ -592,6 +610,9 @@
lblEmptyQuantity.Text = measureResultTTL.EmptyQuantity.ToString();
}
+ int _continuousNGThreshold = 999;
+ int _continuousNG = 0;
+
#region PLC 鐩戝惉
void OPCEventHandler(object sender, EventTool.ListenEventArgs e)
{
@@ -611,11 +632,12 @@
MeasureState pState = MeasureState.NA;
int detectID = CommonUtil.StepControl.GetUnloadStepID();
+ ProductMeasureResult x = null;
if (detectID > 0)
{
- var x = (from t in productTestCollection
- where t.DetectID == detectID
- select t
+ x = (from t in productTestCollection
+ where t.DetectID == detectID
+ select t
).FirstOrDefault();
if (x != default(ProductMeasureResult))
{
@@ -647,18 +669,28 @@
case MeasureState.OK:
opc.Write(OPCOutputTag.DetectResult_OK, true);
opc.Write(OPCOutputTag.DetectResult_NG, false);
+
+ CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏K Tray");
+
+ _continuousNG = 0;
break;
case MeasureState.NG:
opc.Write(OPCOutputTag.DetectResult_OK, false);
opc.Write(OPCOutputTag.DetectResult_NG, true);
+ CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏G Tray");
CommonUtil.StepControl.RemoveById(detectID);
+
+ _continuousNG++;
break;
default:
opc.Write(OPCOutputTag.DetectResult_OK, false);
opc.Write(OPCOutputTag.DetectResult_NG, false);
+ CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏A Tray");
CommonUtil.StepControl.RemoveById(detectID);
+
+ _continuousNG = 0;
break;
}
#endregion
@@ -682,6 +714,15 @@
DisplayCycleTime((int)Math.Round(ts.TotalMilliseconds));
}
unloadTime = DateTime.Now;
+
+ if (_continuousNG >= _continuousNGThreshold)
+ {
+ //鑴氭湰涓缃姤璀︾爜2000琛ㄧず杩炵画NG娆℃暟鍒拌揪璁惧畾鎶ヨ涓婇檺
+ opc.Write(OPCOutputTag.Alarm, 2000);
+
+ CommonUtil.WriteLog(LogType.Inf, $"浜у搧杩炵画NG{_continuousNG}娆★紝鎶ヨ鎻愮ず");
+ _continuousNG = 0;
+ }
//
}
break;
@@ -878,8 +919,10 @@
if ((bool)item.value)
{
//opc.Write(OPCInputTag.UnloadBatteryDone, false);
-
int batteryId = CommonUtil.StepControl.GetUnloadBatteryID();
+
+ CommonUtil.WriteLog(LogType.Inf, $"鐢垫睜涓嬫枡鍒颁綅,Id:{batteryId}");
+
CommonUtil.StepControl.RemoveById(batteryId);
detectionData.SaveTrayBarcode(batteryId);
}
@@ -1032,18 +1075,34 @@
#region 浜嬩欢
private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
{
- Stop();
- SaveMeasureTTL();
- Task.Factory.StartNew(() =>
+ try
{
+ Stop();
+ SaveMeasureTTL();
+ //Task.Factory.StartNew(() =>
+ //{
SpotCheckData data = new SpotCheckData();
data.UpdateLastBreakProductQty(measureResultTTL.ProductQuntity);
DownTimeData downTimeData = new DownTimeData();
DownTime downTime = new DownTime() { BeginTime = DateTime.Now, Type = DownTimeType.Closed };
downTimeData.SaveDownTime(downTime);
- });
+ //});
- MessageHandler.MessageHandlerInstance.Close();
+ MessageHandler.MessageHandlerInstance.Close();
+ }
+ catch (Exception ex)
+ {
+ Trace.TraceError($"鐣岄潰鍏抽棴寮傚父锛歿ex.Message}");
+ }
+ finally
+ {
+ lock (CommonUtil.UploadDataLock)
+ {
+ //CommonUtil.UploadDoneHandle.WaitOne();
+ CommonUtil.UploadDataEnable = false;
+ System.Environment.Exit(0);
+ }
+ }
}
private void btnConfig_Click(object sender, EventArgs e)
@@ -1604,8 +1663,11 @@
private void btnPlcOperation_Click(object sender, EventArgs e)
{
- FormPlcOperation frm = new FormPlcOperation(opc);
- frm.ShowDialog();
+ //if (new ConfigPassword("").ShowDialog() == DialogResult.OK)
+ {
+ FormPlcOperation frm = new FormPlcOperation(opc);
+ frm.ShowDialog();
+ }
}
private void btnCheck_Click(object sender, EventArgs e)
--
Gitblit v1.8.0