From 3c583b1091133e4af23c2534ae96bd094c132d58 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 24 五月 2021 08:46:47 +0800
Subject: [PATCH] 1. 更新dll引用地址 2. 主界面PLC操作安全屏蔽功能添加密码输入界面
---
MainForm.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/MainForm.cs b/MainForm.cs
index 726e365..dd776ae 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);
}
--
Gitblit v1.8.0