From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整

---
 src/Bro.M071.Process/M071Process.cs |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 70d01cd..144827a 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -61,7 +61,6 @@
 
             Reset(null, null, null);
             FullReset(null);
-
         }
 
         private void InitialMotionCardBaseAxisAlarm()
@@ -82,7 +81,7 @@
         private void InitialSetting()
         {
             //鏁版嵁搴撹縼绉绘鏌�
-            DatabaseInitialize.Initialize();
+            //DatabaseInitialize.Initialize();
 
             MotionCardSettingCheck();
 
@@ -196,7 +195,7 @@
             }
 
             MachineState = MachineState.Running;
-            OnMeasureStart?.BeginInvoke(null, null);
+            OnMeasureStart?.Invoke();
 
             var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
             measurements.ForEach(m =>
@@ -226,9 +225,12 @@
 
             Config.SnapshotPointCollection.Where(u => u.IsEnabled).ToList().ForEach(s =>
                   {
-                      _pauseHandle.WaitHandle.WaitOne();
+                      _pausedHandle.Wait();
 
-                      if (MachineState != MachineState.Running)
+                      if (MachineState == MachineState.Ready)
+                          return;
+
+                      if (MachineState != MachineState.Running && MachineState != MachineState.Pause)
                       {
                           throw new ProcessException("鏈哄彴鐘舵�佷笉鍦ㄨ繍琛屼腑锛岄��鍑烘娴�");
                       }
@@ -336,10 +338,14 @@
         {
             if (sender is ProductionMeasurement pMeasure)
             {
-                lock (pMeasure)
+                var production = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
+                if (production == null)
+                    return;
+
+                lock (production)
                 {
                     //妫�鏌ユ槸鍚﹀叏閮ㄥ畬鎴�
-                    pMeasure.Measurements.ForEach(m =>
+                    pMeasure.Measurements?.ForEach(m =>
                     {
                         if (m.KeyUnitCollection.All(k => k.IsDone != null))
                         {
@@ -381,7 +387,7 @@
                                 indicator.ResultState = m.Spec.MeasureResult;
                                 pMeasure.ElementList.Add(indicator);
                                 //杈撳嚭鍥惧舰鍩哄厓鍒扮晫闈� 
-                                OnElementUpdated?.BeginInvoke(indicator, null, null);
+                                OnElementUpdated?.Invoke(indicator);
 
                                 SaveKeyImages(pMeasure.Barcode, m);
 
@@ -494,7 +500,7 @@
                     MeasurementUnitResult measurementUnitResult = new MeasurementUnitResult();
                     measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
                     measurementUnitResult.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
-                    measurementUnitResult.MeasurementName = measurementUnit.Name;
+                    measurementUnitResult.MeasurementName = measurementUnit.GetDisplayText();
                     measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
                     measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue.ToString();
                     measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";
@@ -723,14 +729,14 @@
                           });
                  }
 
-                 string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
+                 string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{DateTime.Now.ToString("yyyyMMdd")}", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
                  if (!Directory.Exists(dir))
                  {
                      Directory.CreateDirectory(dir);
                  }
 
-                 Parallel.For(1, count.I + 1, (i) =>
-                 //for (int i = 1; i <= count.I; i++)
+                 //Parallel.For(1, count.I + 1, (i) =>
+                 for (int i = 1; i <= count.I; i++)
                  {
                      HOperatorSet.SelectObj(images, out HObject image, i);
 
@@ -762,10 +768,11 @@
                                      var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").HTupleToDouble();
                                      if (results.Count == 0 || results.Any(u => u < 0))
                                      {
-                                         LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬粨鏋滃紓甯�", "");
+                                         LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁寮傚父", "");
                                      }
                                      else
                                      {
+                                         LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁", $"{string.Join(" ", results)}");
                                          resultDict = k.KeyResultList.ToDictionary(u => u, u =>
                                               {
                                                   int index = k.KeyResultList.IndexOf(u);
@@ -784,7 +791,7 @@
 
                      //image.Dispose();
                  }
-                 );
+                 //);
 
                  //if (count.I != 1)
                  //{

--
Gitblit v1.8.0