From 4cb676856f0c791ffcbef569c0ca8195bf8b0938 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期六, 04 七月 2020 18:05:47 +0800
Subject: [PATCH] 数据库操作

---
 src/Bro.M071.Process/M071Process.cs |   66 ++++++--------------------------
 1 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 68b79c6..f76d19a 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -2,6 +2,7 @@
 using Bro.Common.Helper;
 using Bro.Common.Interface;
 using Bro.Common.Model;
+using Bro.M071.Model;
 using Bro.Process;
 using HalconDotNet;
 using System;
@@ -33,7 +34,7 @@
 
         #region 浜嬩欢
         public event Action OnMeasureStart;
-        public event Action<string> OnBarcodeChanged;
+        public event Action OnClearBarcode;
         public event Action<IShapeElement> OnElementUpdated;
         #endregion
 
@@ -51,11 +52,14 @@
         /// </summary>
         private void CheckMachineState()
         {
-            throw new NotImplementedException();
+            //throw new NotImplementedException();
         }
 
         private void InitialSetting()
         {
+            //鏁版嵁搴撹縼绉绘鏌�
+            DatabaseInitialize.Initialize();
+
             Config.SnapshotPointCollection.ForEach(u =>
             {
                 u.GetHalconToolPathList().ForEach(path =>
@@ -110,7 +114,7 @@
                     if (keyRespone.Count == 0)
                         throw new ProcessException($"{u.GetDisplayText()}瀵瑰簲鐨勫崟閿笉瀛樺湪鎴栦笉鍙敤");
 
-                    if (b.KeyResult == "All")
+                    if (b.KeyResultId == "All")
                     {
                         keyRespone.SelectMany(kr => kr.KeyResultList).ToList().ForEach(r =>
                           {
@@ -119,7 +123,7 @@
                     }
                     else
                     {
-                        b.MeasureValueDict[b.KeyResult] = null;
+                        b.MeasureValueDict[b.KeyResultId] = null;
                     }
                 });
             });
@@ -150,19 +154,7 @@
         //}
         #endregion
 
-        private string barCode = "";
-        public string BarCode
-        {
-            get => barCode;
-            set
-            {
-                if (barCode != value)
-                {
-                    barCode = value;
-                    OnBarcodeChanged?.Invoke(value);
-                }
-            }
-        }
+        public string BarCode { get; set; }
 
         List<ProductionMeasurement> productionList = new List<ProductionMeasurement>();
 
@@ -171,6 +163,7 @@
         {
             if (string.IsNullOrWhiteSpace(BarCode))
             {
+                OnClearBarcode?.Invoke();
                 throw new ProcessException("鏈緭鍏ヤ骇鍝佹潯鐮侊紝璇峰嬁寮�濮嬫祴閲�");
             }
 
@@ -236,39 +229,6 @@
             BarCode = "";
 
             return new ProcessResponse(true);
-        }
-
-        /// <summary>
-        /// 鏆傚仠鏍囧織  
-        /// WaitHandle 鏆傚仠鍙ユ焺  榛樿涓洪潪闃诲 鍙墽琛�
-        /// WaitResult 鏆傚仠鏍囧織 true 姝ｅ父鎵ц  false 鏆傚仠涓�
-        /// </summary>
-        ManualWaitConfirm _pauseHandle = new ManualWaitConfirm()
-        {
-            WaitHandle = new ManualResetEvent(true),
-            WaitResult = true,
-        };
-
-        [ProcessMethod("", "PauseJob", "鏆傚仠娴佺▼", InvokeType.TestInvoke)]
-        public ProcessResponse PauseJob(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
-        {
-            if (_pauseHandle.WaitResult)
-            {
-                #region 鏉垮崱鏆傚仠鍔ㄤ綔
-                #endregion
-
-                _pauseHandle.WaitHandle.Reset();
-            }
-            else
-            {
-                #region 鏉垮崱鎭㈠鍔ㄤ綔
-                #endregion
-
-                _pauseHandle.WaitHandle.Set();
-            }
-
-            _pauseHandle.WaitResult = !_pauseHandle.WaitResult;
-            return new ProcessResponse(_pauseHandle.WaitResult);
         }
 
         #region 绉佹湁鏂规硶
@@ -379,7 +339,7 @@
             }
         }
 
-        private void SaveKeyImages(string barCode, MeasurementUint measureUnit)
+        private void SaveKeyImages(string barCode, MeasurementUnit measureUnit)
         {
             string measureName = measureUnit.GetDisplayText();
             if (Config.ImageSaveOption.IsSaveOriginImage)
@@ -410,7 +370,7 @@
             }
         }
 
-        private async void SaveKeyImages(MeasurementUint measureUnit, string measureName, string dir)
+        private async void SaveKeyImages(MeasurementUnit measureUnit, string measureName, string dir)
         {
             await Task.Run(() =>
             {
@@ -430,7 +390,7 @@
         }
         #endregion
 
-        private async void RunImageHandle(CameraBase camera, IOperationConfig opConfig, HImage hImage, string snapshotId, string snapshotName, List<MeasurementUint> measureList)
+        private async void RunImageHandle(CameraBase camera, IOperationConfig opConfig, HImage hImage, string snapshotId, string snapshotName, List<MeasurementUnit> measureList)
         {
             await Task.Run(() =>
              {

--
Gitblit v1.8.0