From 220f43bdfb1e1d1544c892697304f99e967103a4 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 22 十一月 2021 08:42:14 +0800
Subject: [PATCH] 1. 添加了扫码键盘事件的日志记录，版本号升级到1.0.4.0
---
MainForm.cs | 74 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/MainForm.cs b/MainForm.cs
index 45e464d..3c791e3 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -137,6 +137,8 @@
this.KeyPreview = true;
this.KeyPress += MainForm_KeyPress;
+ Trace.TraceInformation("閿洏浜嬩欢宸插姞杞�");
+
hcXyView.Focus();
}
@@ -144,16 +146,28 @@
CarrierBarcodeCtrl cBarcodeCtrl = null;
private void MainForm_KeyPress(object sender, KeyPressEventArgs e)
{
- if (e.KeyChar == 27)
+ try
{
- hcXyView.Focus();
- }
- else
- {
- if (allowBarcodeFlag)
+ if (e.KeyChar == 27)
{
- cBarcodeCtrl.AddChar(e.KeyChar);
+ hcXyView.Focus();
}
+ else
+ {
+ if (allowBarcodeFlag)
+ {
+ Trace.TraceInformation($"閿洏杈撳叆锛歿e.KeyChar}");
+ cBarcodeCtrl.AddChar(e.KeyChar);
+ }
+ else
+ {
+ Trace.TraceInformation($"褰撳墠涓嶅厑璁告寜閿緭鍏ワ細{e.KeyChar}");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Trace.TraceError($"閿洏浜嬩欢寮傚父锛歿ex.Message}");
}
}
#endregion
@@ -207,6 +221,10 @@
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))
@@ -666,7 +684,7 @@
opc.Write(OPCOutputTag.DetectResult_OK, true);
opc.Write(OPCOutputTag.DetectResult_NG, false);
- CommonUtil.WriteLog(LogType.Inf, $"{x.DetectID}|{x.ProductNo}浜у搧搴旀斁鍏K Tray");
+ CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏K Tray");
_continuousNG = 0;
break;
@@ -674,7 +692,7 @@
opc.Write(OPCOutputTag.DetectResult_OK, false);
opc.Write(OPCOutputTag.DetectResult_NG, true);
- CommonUtil.WriteLog(LogType.Inf, $"{x.DetectID}|{x.ProductNo}浜у搧搴旀斁鍏G Tray");
+ CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏G Tray");
CommonUtil.StepControl.RemoveById(detectID);
_continuousNG++;
@@ -683,7 +701,7 @@
opc.Write(OPCOutputTag.DetectResult_OK, false);
opc.Write(OPCOutputTag.DetectResult_NG, false);
- CommonUtil.WriteLog(LogType.Inf, $"{x.DetectID}|{x.ProductNo}浜у搧搴旀斁鍏A Tray");
+ CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏A Tray");
CommonUtil.StepControl.RemoveById(detectID);
_continuousNG = 0;
@@ -714,7 +732,7 @@
if (_continuousNG >= _continuousNGThreshold)
{
//鑴氭湰涓缃姤璀︾爜2000琛ㄧず杩炵画NG娆℃暟鍒拌揪璁惧畾鎶ヨ涓婇檺
- opc.Write(OPCInputTag.Alarm, 2000);
+ opc.Write(OPCOutputTag.Alarm, 2000);
CommonUtil.WriteLog(LogType.Inf, $"浜у搧杩炵画NG{_continuousNG}娆★紝鎶ヨ鎻愮ず");
_continuousNG = 0;
@@ -942,7 +960,6 @@
if ((bool)item.value)
{
//opc.Write(OPCInputTag.UnloadTrayReady, false);
-
allowBarcodeFlag = false;
}
break;
@@ -1071,18 +1088,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)
@@ -1643,8 +1676,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