From 581b672fbafc258f05aae700debfbfab5a515408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期四, 27 五月 2021 08:25:05 +0800
Subject: [PATCH] 1. 更改灰点相机dll版本

---
 MainForm.cs |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/MainForm.cs b/MainForm.cs
index 726e365..19f79e4 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);
                     }
@@ -1604,8 +1647,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