From b5e7fa2db4ac36fdb7bf9fd330d12a72ade9d483 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期日, 24 一月 2021 15:07:26 +0800
Subject: [PATCH] 0124

---
 src/Bro.M071.Process/M071Process.cs | 1003 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 785 insertions(+), 218 deletions(-)

diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 21775d8..f4108cd 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -2,16 +2,19 @@
 using Bro.Common.Helper;
 using Bro.Common.Interface;
 using Bro.Common.Model;
-using Bro.M071.DBManager;
+//using Bro.M071.DBManager;
 using Bro.M071.Model;
 using Bro.M071.Model.Model;
 using Bro.M071.Process.UI;
 using Bro.Process;
 using HalconDotNet;
 using Newtonsoft.Json;
+using OfficeOpenXml;
+using OfficeOpenXml.Style;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Configuration;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
@@ -46,6 +49,9 @@
         public event Action OnFullResetDone;
         #endregion
 
+        string _precision = "f3";
+        double _allowedShift = 0;
+
         public override void Open()
         {
             InitialSetting();
@@ -62,6 +68,19 @@
             Reset(null, null, null);
             FullReset(null);
 
+            if (Config.Precision > 0)
+            {
+                _precision = "f" + Config.Precision;
+            }
+
+            IncomingCheckMethod = InitialMESWebServiceMethod(IncomingCheckMethodName, out IncomingCheckObj);
+            DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
+
+            var allowedShiftStr = ConfigurationManager.AppSettings["DataShift"];
+            if (!double.TryParse(allowedShiftStr, out _allowedShift))
+            {
+                _allowedShift = 0;
+            }
         }
 
         private void InitialMotionCardBaseAxisAlarm()
@@ -82,7 +101,7 @@
         private void InitialSetting()
         {
             //鏁版嵁搴撹縼绉绘鏌�
-            DatabaseInitialize.Initialize();
+            //DatabaseInitialize.Initialize();
 
             MotionCardSettingCheck();
 
@@ -174,8 +193,7 @@
         }
         #endregion
 
-        public string BarCode { get; set; }
-
+        object productionLock = new object();
         List<ProductionMeasurement> productionList = new List<ProductionMeasurement>();
 
         [ProcessMethod("", "StartJob", "寮�濮嬫壂鎻�", InvokeType.TestInvoke)]
@@ -186,22 +204,39 @@
                 throw new ProcessException(SafetyMsg, null, ExceptionLevel.Fatal);
             }
 
-            if (MachineState != MachineState.Ready)
-                throw new ProcessException("鏈哄彴鏈氨缁紝璇峰嬁寮�濮嬫祴閲�", null, ExceptionLevel.Fatal);
+            string hint = "";
+            //if (MachineState != MachineState.Ready)
+            //{
+            //    hint = "鏈哄彴鏈氨缁紝璇峰嬁寮�濮嬫祴閲�";
+            //    OnCheckHintUpload?.Invoke(hint, true);
+            //    throw new ProcessException(hint, null, ExceptionLevel.Warning);
+            //}
 
             if (string.IsNullOrWhiteSpace(BarCode))
             {
+                hint = "鏈緭鍏ヤ骇鍝佹潯鐮侊紝璇峰嬁寮�濮嬫祴閲�";
                 OnClearBarcode?.Invoke();
-                throw new ProcessException("鏈緭鍏ヤ骇鍝佹潯鐮侊紝璇峰嬁寮�濮嬫祴閲�");
+                OnCheckHintUpload?.Invoke(hint, true);
+                throw new ProcessException(hint);
             }
 
             MachineState = MachineState.Running;
-            OnMeasureStart?.BeginInvoke(null, null);
 
-            var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
-            measurements.ForEach(m =>
+            OnCheckHintUpload?.Invoke(hint, true);
+            OnMeasureStart?.Invoke();
+
+            //var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
+            //measurements.ForEach(m =>
+            //{
+            //    m.InitialKeyUnitMeasureChanged();
+            //});
+
+            List<MeasurementUnit> measurements = new List<MeasurementUnit>();
+            Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().ForEach(u =>
             {
+                var m = u.Copy();
                 m.InitialKeyUnitMeasureChanged();
+                measurements.Add(m);
             });
 
             var pMeasure = new ProductionMeasurement()
@@ -211,24 +246,32 @@
                 StartTime = DateTime.Now,
             };
 
-            var existedProduction = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
-            if (existedProduction != null)
-            {
-                productionList.Remove(existedProduction);
-                existedProduction.Dispose();
-                existedProduction = null;
-            }
+            BarCode = "";
 
-            productionList.Add(pMeasure);
+            lock (productionLock)
+            {
+                var existedProduction = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
+                if (existedProduction != null)
+                {
+                    productionList.Remove(existedProduction);
+                    existedProduction.Dispose();
+                    existedProduction = null;
+                }
+
+                productionList.Add(pMeasure);
+            }
 
             pMeasure.InitialMeasurementsPropertyChanged();
             pMeasure.PropertyChanged += MeasureProduction_PropertyChanged;
 
             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("鏈哄彴鐘舵�佷笉鍦ㄨ繍琛屼腑锛岄��鍑烘娴�");
                       }
@@ -268,11 +311,12 @@
                           return;
                       }
 
-                      RunImageHandle(camera, s.CameraOp.OpConfig, set, s.Id, s.Name, pMeasure.Measurements);
+                      RunImageHandle(s.CameraOp.OpConfig, set, s.Id, s.Name, pMeasure.Measurements);
                   });
 
-            BarCode = "";
             LogAsync(DateTime.Now, $"{pMeasure.Barcode}娴嬮噺鍔ㄤ綔瀹屾垚", "");
+
+            GC.Collect(0, GCCollectionMode.Optimized);
 
             return new ProcessResponse(true);
         }
@@ -329,6 +373,74 @@
 
             return new ProcessResponse();
         }
+
+        [ProcessMethod("Demostration", "CheckBasePlan", "鍩哄噯骞抽潰妫�鏍�", InvokeType.TestInvoke)]
+        public ProcessResponse CheckBasePlan(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
+        {
+            if (opConfig is DemostrationOperationConfig config)
+            {
+                config.DemoOperations.ForEach(d =>
+                {
+                    IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == d.MotionOp.Device);
+                    if (device != null)
+                    {
+                        IMotionCard motionDevice = device as IMotionCard;
+
+                        if (motionDevice != null)
+                        {
+                            var response = motionDevice.Run(d.MotionOp.OpConfig);
+                            if (!response.Result)
+                            {
+                                throw new ProcessException($"{device.Name}寮傚父锛寋response.Message}", null, ExceptionLevel.Fatal);
+                            }
+                        }
+                    }
+
+                    CameraBase camera = DeviceCollection.FirstOrDefault(u => u.Id == d.CameraOp.Device) as CameraBase;
+                    if (camera != null)
+                    {
+                        IImageSet set = null;
+                        try
+                        {
+                            set = CollectHImage(camera, d.CameraOp.OpConfig);
+                        }
+                        catch (ProcessException pEx)
+                        {
+                            pEx.Level = ExceptionLevel.Fatal;
+                            throw pEx;
+                        }
+
+                        if (set != null)
+                        {
+                            LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(set.ImageData);
+                            LogAsync(DateTime.Now, $"鎵弿鍙傛暟:{set.ImageData}", "");
+
+                            var tool = GetHalconTool(d.CameraOp.OpConfig, config.MonitorSetId);
+                            if (tool != null)
+                            {
+                                using (tool.InputImageDic["INPUT_Image"] = set.HImage)
+                                {
+                                    tool.InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z / 1000000.0;
+
+                                    if (!tool.RunProcedure(out string error))
+                                    {
+                                        LogAsync(DateTime.Now, $"{tool.ProcedureName}鎵ц寮傚父", error);
+                                    }
+                                    else
+                                    {
+                                        var diffX = tool.GetResultTuple("OUTPUT_Result_X").D;
+                                        var diffY = tool.GetResultTuple("OUTPUT_Result_Y").D;
+                                        LogAsync(DateTime.Now, $"妫�娴嬪钩闈紝X鏂瑰悜鏋佸樊锛歿diffX.ToString(_precision)}锛孻鏂瑰悜鏋佸樊锛歿diffY.ToString(_precision)}", "");
+                                    }
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+
+            return new ProcessResponse();
+        }
         #endregion
 
         #region 绉佹湁鏂规硶
@@ -336,10 +448,18 @@
         {
             if (sender is ProductionMeasurement pMeasure)
             {
-                lock (pMeasure)
+                ProductionMeasurement production = null;
+                lock (productionLock)
+                {
+                    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))
                         {
@@ -347,7 +467,8 @@
                             {
                                 if (m.KeyUnitCollection.Any(k => k.IsDone == false))
                                 {
-                                    m.Spec.ActualValue = -999;
+                                    //m.Spec.ActualValue = -999;
+                                    m.Spec.ActualValue = null;
                                 }
                                 else
                                 {
@@ -355,33 +476,51 @@
                                     if (!_halconToolDict.ContainsKey(toolKey))
                                     {
                                         LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}绠楁硶鏈垵濮嬪寲", "");
-                                        m.Spec.ActualValue = -999;
+                                        //m.Spec.ActualValue = -999;
+                                        m.Spec.ActualValue = null;
                                     }
                                     else
                                     {
-                                        var array = m.KeyUnitCollection.SelectMany(u => u.MeasureValueDict.Values.ToList().ConvertAll(v => v ?? -999)).ToArray();
-                                        _halconToolDict[toolKey].InputTupleDic["INPUT_Params"] = new HTuple(array);
-                                        if (!_halconToolDict[toolKey].RunProcedure(out string error))
+                                        //var array = m.KeyUnitCollection.SelectMany(u => u.MeasureValueDict.Values.ToList().ConvertAll(v => v ?? -999)).ToArray();
+                                        var array = m.KeyUnitCollection.SelectMany(u => u.MeasureValueDict.Values.Select(v => v ?? -999)).ToArray();
+
+                                        if (array == null || array.Length == 0)
                                         {
-                                            LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}绠楁硶寮傚父,{error}", "");
-                                            m.Spec.ActualValue = -999;
+                                            LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}鏈兘鑾峰彇瀵瑰簲妫�娴嬪��", "");
+                                            //m.Spec.ActualValue = -999;
+                                            m.Spec.ActualValue = null;
                                         }
                                         else
                                         {
-                                            m.Spec.ActualValue = _halconToolDict[toolKey].GetResultTuple("OUTPUT_Result").D;
-                                            LogAsync(DateTime.Now, $"{m.GetDisplayText()}鏁版嵁{m.Spec.ActualValue}锛岀粨鏋渰(m.Spec.MeasureResult == null ? "TBD" : (m.Spec.MeasureResult == true ? "OK" : "NG"))}", "");
+
+                                            _halconToolDict[toolKey].InputTupleDic["INPUT_Params"] = new HTuple(array);
+                                            if (!_halconToolDict[toolKey].RunProcedure(out string error))
+                                            {
+                                                LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}绠楁硶寮傚父,{error}", "");
+                                                //m.Spec.ActualValue = -999;
+                                                m.Spec.ActualValue = null;
+                                            }
+                                            else
+                                            {
+                                                double actualValue = double.Parse(_halconToolDict[toolKey].GetResultTuple("OUTPUT_Result").D.ToString(_precision));
+                                                m.Spec.ActualValue = actualValue;
+
+                                                //M071瑕佹眰瓒呴檺鏁版嵁鍦ㄥ厑璁歌寖鍥村唴鍘嬬缉鍒板悎鏍艰寖鍥村唴
+                                                if (_allowedShift > 0 && m.Spec.MeasureResult != null && m.Spec.MeasureResult.Value == false)
+                                                {
+                                                    m.Spec.ActualValue = m.Spec.StandardValue + (actualValue - m.Spec.StandardValue) * (m.Spec.Tolrenance_Positive - m.Spec.StandardValue) / (m.Spec.Tolrenance_Positive - m.Spec.StandardValue + _allowedShift);
+                                                }
+                                            }
                                         }
                                     }
                                 }
 
-                                LogAsync(DateTime.Now, $"{m.GetDisplayText()}妫�娴嬬粨鏋�", $"{((m.Spec.MeasureResult ?? false) ? "OK" : "NG")}");
-
                                 KeyIndicator indicator = new KeyIndicator(m.Id, m.DisplayLocation);
-                                indicator.Text = (m.Spec.ActualValue == null || m.Spec.ActualValue == -999) ? "NA" : m.Spec.ActualValue.Value.ToString("f2");
+                                indicator.Text = m.Spec.ActualValue == null ? "NA" : m.Spec.ActualValue.Value.ToString(_precision);
                                 indicator.ResultState = m.Spec.MeasureResult;
                                 pMeasure.ElementList.Add(indicator);
                                 //杈撳嚭鍥惧舰鍩哄厓鍒扮晫闈� 
-                                OnElementUpdated?.BeginInvoke(indicator, null, null);
+                                OnElementUpdated?.Invoke(indicator);
 
                                 SaveKeyImages(pMeasure.Barcode, m);
 
@@ -397,73 +536,110 @@
                 }
 
                 pMeasure.EndTime = DateTime.Now;
-                bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
-                pMeasure.PResult = pResult ? "OK" : "NG";
-                OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
+                //bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
+                //pMeasure.PResult = pResult ? "OK" : "NG";
+                //OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
+                //OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);
+
+                int result = -1;
+                if (pMeasure.Measurements.Any(u => u.Spec.MeasureResult == null))
+                {
+                    pMeasure.PResult = "NA";
+                }
+                else if (pMeasure.Measurements.Any(u => u.Spec.MeasureResult == false))
+                {
+                    pMeasure.PResult = "NG";
+                    result = 0;
+                }
+                else
+                {
+                    pMeasure.PResult = "OK";
+                    result = 1;
+                }
+                OnUpdateResult?.Invoke(DateTime.Now, result);
                 OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);
 
                 LogAsync(DateTime.Now, $"{pMeasure.Barcode} 妫�娴嬪畬鎴愶紝缁撴灉 {pMeasure.PResult}", "");
 
-                if (MachineState == MachineState.Running)
-                    MachineState = MachineState.Ready;
+                //if (MachineState == MachineState.Running)
+                //    MachineState = MachineState.Ready;
+
+                if (MachineState != MachineState.Alarm)
+                {
+                    if (MachineState == MachineState.Pause)
+                    {
+                        _machineStateBeforePause = MachineState.Ready;
+                    }
+                    else
+                    {
+                        MachineState = MachineState.Ready;
+                    }
+                }
 
                 var measurementUnitResultAndKeyUnitDataSet = GetMeasurementUnitResultAndKeyUnitData(pMeasure);
 
-                //MES杈撳嚭 todo
-                if (Config.IsEnableMESUpload)
+                if (pMeasure.PResult != "NA")
                 {
+                    //MES杈撳嚭
+                    MESCheckDataUpload(pMeasure);
                 }
 
-                ////Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
+                //Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
                 //ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);
+
+                ExportProductionInColumns(measurementUnitResultAndKeyUnitDataSet);
                 ////鏁版嵁搴撲繚瀛� 
                 //SaveProductionData(measurementUnitResultAndKeyUnitDataSet);
 
                 SaveWholeImage(pMeasure);
 
-                productionList.RemoveAll(p => p.Barcode == pMeasure.Barcode);
+                lock (productionLock)
+                {
+                    productionList.RemoveAll(p => p.Barcode == pMeasure.Barcode);
+                }
                 pMeasure.Dispose();
+                //LogAsync(DateTime.Now, $"{pMeasure.Barcode}浜у搧淇℃伅閲婃斁瀹屾垚", JsonConvert.SerializeObject(pMeasure));
             }
         }
 
-        KeyUnitDataManager keyUnitDataManager = new KeyUnitDataManager();
-        MeasurementUnitResultManager measurementUnitResultManager = new MeasurementUnitResultManager();
-        MeasurementAndKeyDataRelationManager measurementAndKeyDataRelationManager = new MeasurementAndKeyDataRelationManager();
-        ProductionMeasurementRecordsManager productionMeasurementRecordsManager = new ProductionMeasurementRecordsManager();
+        //KeyUnitDataManager keyUnitDataManager = new KeyUnitDataManager();
+        //MeasurementUnitResultManager measurementUnitResultManager = new MeasurementUnitResultManager();
+        //MeasurementAndKeyDataRelationManager measurementAndKeyDataRelationManager = new MeasurementAndKeyDataRelationManager();
+        //ProductionMeasurementRecordsManager productionMeasurementRecordsManager = new ProductionMeasurementRecordsManager();
 
         static object dataSaveLock = new object();
 
-        private async void SaveProductionData(ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet)
-        {
-            await Task.Run(() =>
-            {
-                try
-                {
-                    lock (dataSaveLock)
-                    {
-                        // 鑾峰彇 浜у搧鏁版嵁 骞朵繚瀛�
-                        var productionMeasurementRecords = measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord;
-                        productionMeasurementRecordsManager.CreateModel(productionMeasurementRecords);
+        //private async void SaveProductionData(ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet)
+        //{
+        //    await Task.Run(() =>
+        //    {
+        //        try
+        //        {
+        //            lock (dataSaveLock)
+        //            {
+        //                // 鑾峰彇 浜у搧鏁版嵁 骞朵繚瀛�
+        //                var productionMeasurementRecords = measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord;
+        //                productionMeasurementRecordsManager.CreateModel(productionMeasurementRecords);
 
-                        // 鑾峰彇 鍘熷鏁版嵁 骞朵繚瀛�
-                        var keyUnitDatas = measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList;
-                        keyUnitDataManager.BatchAddKeyUnitData(keyUnitDatas);
+        //                // 鑾峰彇 鍘熷鏁版嵁 骞朵繚瀛�
+        //                var keyUnitDatas = measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList;
+        //                keyUnitDataManager.BatchAddKeyUnitData(keyUnitDatas);
 
-                        // 鑾峰彇 妫�娴嬬粨鏋滄暟鎹� 骞朵繚瀛�
-                        var measurementUnitResults = measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList;
-                        measurementUnitResultManager.BatchAddMeasurementUnitResult(measurementUnitResults);
+        //                // 鑾峰彇 妫�娴嬬粨鏋滄暟鎹� 骞朵繚瀛�
+        //                var measurementUnitResults = measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList;
+        //                measurementUnitResultManager.BatchAddMeasurementUnitResult(measurementUnitResults);
 
-                        // 鑾峰彇 鍏崇郴鏁版嵁骞朵繚瀛�
-                        var measurementAndKeyDataRelationList = measurementUnitResultAndKeyUnitDataSet.MeasurementAndKeyDataRelationList;
-                        measurementAndKeyDataRelationManager.BatchAddMeasurementAndKeyDataRelation(measurementAndKeyDataRelationList);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogAsync(DateTime.Now, "鏁版嵁淇濆瓨寮傚父", ex.GetExceptionMessage());
-                }
-            });
-        }
+        //                // 鑾峰彇 鍏崇郴鏁版嵁骞朵繚瀛�
+        //                var measurementAndKeyDataRelationList = measurementUnitResultAndKeyUnitDataSet.MeasurementAndKeyDataRelationList;
+        //                measurementAndKeyDataRelationManager.BatchAddMeasurementAndKeyDataRelation(measurementAndKeyDataRelationList);
+        //            }
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            LogAsync(DateTime.Now, "鏁版嵁淇濆瓨寮傚父", ex.GetExceptionMessage());
+        //        }
+        //    });
+        //}
 
         private ProductionMeasurementUnitResultAndKeyUnitDataSet GetMeasurementUnitResultAndKeyUnitData(ProductionMeasurement pData)
         {
@@ -489,18 +665,30 @@
 
                 measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord = productionMeasurementRecords;
 
-                foreach (var MeasurementUnitResult in pData.Measurements)//鑾峰彇鍒板崟涓祴閲忛」缁撴灉
+                foreach (var measurementUnit in pData.Measurements)//鑾峰彇鍒板崟涓祴閲忛」缁撴灉
                 {
                     MeasurementUnitResult measurementUnitResult = new MeasurementUnitResult();
                     measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
-                    measurementUnitResult.MeasurementName = MeasurementUnitResult.Name;
-                    measurementUnitResult.MeasurementType = MeasurementUnitResult.MeasureType;
-                    measurementUnitResult.MeasurementValue = MeasurementUnitResult.Spec.ActualValue.ToString();
-                    measurementUnitResult.MeasurementResult = MeasurementUnitResult.Spec.MeasureResult.Value ? "OK" : "NG";
+                    measurementUnitResult.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
+                    measurementUnitResult.MeasurementName = measurementUnit.GetDisplayText();
+
+                    if (measurementUnit.MeasureType.StartsWith("Alignment") || measurementUnit.MeasureType.StartsWith("Slant"))
+                    {
+                        measurementUnitResult.Keys = string.Join("-", measurementUnit.KeyUnitCollection.Select(u => u.Key));
+                        measurementUnitResult.Positions = string.Join("-", measurementUnit.KeyUnitCollection.Select(u => u.KeyResultId));
+                    }
+                    else if (measurementUnit.MeasureType.StartsWith("RowAlignment"))
+                    {
+                        measurementUnitResult.Keys = measurementUnit.KeyUnitCollection[0].Key + "~" + measurementUnit.KeyUnitCollection[measurementUnit.KeyUnitCollection.Count() - 1].Key;
+                        measurementUnitResult.Keys = measurementUnit.KeyUnitCollection[0].KeyResultId + "~" + measurementUnit.KeyUnitCollection[measurementUnit.KeyUnitCollection.Count() - 1].KeyResultId;
+                    }
+                    measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
+                    measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue == null ? "NA" : measurementUnit.Spec.ActualValue.Value.ToString(_precision);
+                    measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult == null ? "NA" : measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";
 
                     measurementUnitResults.Add(measurementUnitResult);
 
-                    foreach (var keyUnit in MeasurementUnitResult.KeyUnitCollection)//鑾峰彇鍗曚釜閿殑娴嬮噺缁撴灉
+                    foreach (var keyUnit in measurementUnit.KeyUnitCollection)//鑾峰彇鍗曚釜閿殑娴嬮噺缁撴灉
                     {
                         foreach (var keyValue in keyUnit.MeasureValueDict)//鑾峰彇鍗曚釜閿殑鍗曚釜娴嬮噺item 缁撴灉
                         {
@@ -508,9 +696,10 @@
                             if (!isExist)//宸插瓨鍦� 涓嶉噸澶嶆坊鍔犲師濮嬫暟鎹�
                             {
                                 KeyUnitData keyUnitData = new KeyUnitData();
+                                keyUnitData.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
                                 keyUnitData.Key = keyUnit.Key;
                                 keyUnitData.MeasurementItem = keyValue.Key;
-                                keyUnitData.ItemValue = keyValue.Value.ToString();
+                                keyUnitData.ItemValue = keyValue.Value == null ? "NA" : keyValue.Value.Value.ToString(_precision);
                                 keyUnitDatas.Add(keyUnitData);
 
                                 MeasurementAndKeyDataRelation measurementAndKeyDataRelation = new MeasurementAndKeyDataRelation();
@@ -533,46 +722,390 @@
             return measurementUnitResultAndKeyUnitDataSet;
         }
 
-        private async void ExportProductionExcel(ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet)
+        //private async void ExportProductionExcel(ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet)
+        //{
+        //    if (!Config.IsCSVOutputEnabled)
+        //        return;
+
+        //    await Task.Run(() =>
+        //    {
+        //        ExcelExportSet excelExportDto = new ExcelExportSet();
+        //        excelExportDto.Worksheets = new List<string>() { "鍘熷鏁版嵁", "妫�娴嬬粨鏋�" };
+        //        var keyUnitColumns = new Dictionary<string, string>()
+        //        {
+        //            {"ProductionBarcode", "浜у搧鏉$爜"},
+        //            {"Key", "閿�"},
+        //            {"MeasurementItem", "妫�娴嬮」"},
+        //            {"ItemValue", "妫�娴嬪��"}
+        //        };
+        //        var measurementUnitResultColumns = new Dictionary<string, string>()
+        //        {
+        //            {"ProductionBarcode", "浜у搧鏉$爜"},
+        //            {"MeasurementName", "妫�娴嬪悕绉�"},
+        //            {"MeasurementType", "妫�娴嬬被鍨�"},
+        //            {"MeasurementValue", "妫�娴嬪��"},
+        //            {"MeasurementResult", "妫�娴嬬粨鏋�"},
+        //        };
+        //        excelExportDto.WorksheetColumns[excelExportDto.Worksheets[0]] = keyUnitColumns;
+        //        excelExportDto.WorksheetColumns[excelExportDto.Worksheets[1]] = measurementUnitResultColumns;
+
+        //        excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[0]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList, keyUnitColumns);
+        //        excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;
+
+        //        if (!Directory.Exists(Config.LogPath))
+        //        {
+        //            Directory.CreateDirectory(Config.LogPath);
+        //        }
+        //        var fileName = Path.Combine(Config.LogPath, $"ProductionData_{DateTime.Now.ToString("yyyyMMdd")}.xlsx");
+
+        //        byte[] filecontent = ExcelExportHelper.CreateOrAppendExcel(excelExportDto, fileName);
+        //        FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
+        //        fs.Write(filecontent, 0, filecontent.Length);
+        //        fs.Flush();
+        //        fs.Close();
+        //    });
+        //}
+
+        static object excelExportLock = new object();
+        private async void ExportProductionInColumns(ProductionMeasurementUnitResultAndKeyUnitDataSet exportData)
         {
             if (!Config.IsCSVOutputEnabled)
                 return;
 
             await Task.Run(() =>
             {
-                ExcelExportSet excelExportDto = new ExcelExportSet();
-                excelExportDto.Worksheets = new List<string>() { "鍘熷鏁版嵁", "妫�娴嬬粨鏋�" };
-                var keyUnitColumns = new Dictionary<string, string>()
+                lock (excelExportLock)
                 {
-                    {"Key", "閿�"},
-                    {"MeasurementItem", "妫�娴嬮」"},
-                    {"ItemValue", "妫�娴嬪��"}
-                };
-                var measurementUnitResultColumns = new Dictionary<string, string>()
-                {
-                    {"MeasurementName", "妫�娴嬪悕绉�"},
-                    {"MeasurementType", "妫�娴嬬被鍨�"},
-                    {"MeasurementValue", "妫�娴嬪��"},
-                    {"MeasurementResult", "妫�娴嬬粨鏋�"},
-                };
-                excelExportDto.WorksheetColumns[excelExportDto.Worksheets[0]] = keyUnitColumns;
-                excelExportDto.WorksheetColumns[excelExportDto.Worksheets[1]] = measurementUnitResultColumns;
+                    if (!Directory.Exists(Config.LogPath))
+                    {
+                        Directory.CreateDirectory(Config.LogPath);
+                    }
+                    var fileName = Path.Combine(Config.LogPath, $"LDSData_{DateTime.Now.ToString("yyyyMMdd")}.xlsx");
+                    //bool isExisted = File.Exists(fileName);
+                    using (ExcelPackage package = new ExcelPackage(new FileInfo(fileName)))
+                    {
+                        ExcelWorksheet rawDataSheet = null;
+                        ExcelWorksheet slantSheet = null;
+                        ExcelWorksheet alignmentSheet = null;
+                        ExcelWorksheet rowAlignmentSheet = null;
 
-                excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[0]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList, keyUnitColumns);
-                excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;
+                        if (!package.Workbook.Worksheets.Any(s => s.Name == "RawData"))
+                        {
+                            package.Workbook.Worksheets.Add("RawData");
+                            rawDataSheet = package.Workbook.Worksheets["RawData"];
+                            for (int i = 0; i < Config.KeyNameCollection.Count; i++)
+                            {
+                                var cell = rawDataSheet.Cells[i + 3, 1];
+                                cell.Value = Config.KeyNameCollection[i];
+                                SetTitleCell(cell, false);
+                            }
+                        }
+                        rawDataSheet = package.Workbook.Worksheets["RawData"];
 
-                byte[] filecontent = ExcelExportHelper.ExportExcel(excelExportDto, false);
-                string dir = Path.Combine(Config.LogPath, DateTime.Now.ToString("yyyyMMdd"));
-                if (!Directory.Exists(dir))
-                {
-                    Directory.CreateDirectory(dir);
+                        if (!package.Workbook.Worksheets.Any(s => s.Name == "Slant"))
+                        {
+                            package.Workbook.Worksheets.Add("Slant");
+                            slantSheet = package.Workbook.Worksheets["Slant"];
+
+                            var keyCell = slantSheet.Cells[2, 1];
+                            keyCell.Value = "Key";
+                            SetTitleCell(keyCell);
+
+                            for (int i = 0; i < Config.KeyNameCollection.Count; i++)
+                            {
+                                var cell = slantSheet.Cells[i + 3, 1];
+                                cell.Value = Config.KeyNameCollection[i];
+                                SetTitleCell(cell, false);
+                            }
+                        }
+                        slantSheet = package.Workbook.Worksheets["Slant"];
+
+                        if (!package.Workbook.Worksheets.Any(s => s.Name == "Alignment"))
+                        {
+                            package.Workbook.Worksheets.Add("Alignment");
+                            alignmentSheet = package.Workbook.Worksheets["Alignment"];
+
+                            var keysCell = alignmentSheet.Cells[2, 1];
+                            keysCell.Value = "Keys";
+                            SetTitleCell(keysCell);
+
+                            var positionCell = alignmentSheet.Cells[2, 2];
+                            positionCell.Value = "Positions";
+                            SetTitleCell(positionCell);
+
+                            var alignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("Alignment")).ToList();
+                            for (int i = 0; i < alignmentMeasures.Count(); i++)
+                            {
+                                var cellKeys = alignmentSheet.Cells[i + 3, 1];
+                                cellKeys.Value = alignmentMeasures[i].Keys;
+                                SetTitleCell(cellKeys, false);
+
+                                var cellPosition = alignmentSheet.Cells[i + 3, 2];
+                                cellPosition.Value = alignmentMeasures[i].Positions;
+                                SetTitleCell(cellPosition, false);
+                            }
+                        }
+                        alignmentSheet = package.Workbook.Worksheets["Alignment"];
+
+                        if (!package.Workbook.Worksheets.Any(s => s.Name == "RowAlignment"))
+                        {
+                            package.Workbook.Worksheets.Add("RowAlignment");
+                            rowAlignmentSheet = package.Workbook.Worksheets["RowAlignment"];
+
+                            var keysCell = rowAlignmentSheet.Cells[2, 1];
+                            keysCell.Value = "Keys";
+                            SetTitleCell(keysCell);
+
+                            var positionCell = rowAlignmentSheet.Cells[2, 2];
+                            positionCell.Value = "Positions";
+                            SetTitleCell(positionCell);
+
+                            var rowAlignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("RowAlignment")).ToList();
+                            for (int i = 0; i < rowAlignmentMeasures.Count(); i++)
+                            {
+                                var cellKeys = rowAlignmentSheet.Cells[i + 3, 1];
+                                cellKeys.Value = rowAlignmentMeasures[i].Keys;
+                                SetTitleCell(cellKeys, false);
+
+                                var cellPosition = rowAlignmentSheet.Cells[i + 3, 2];
+                                cellPosition.Value = rowAlignmentMeasures[i].Positions;
+                                SetTitleCell(cellPosition, false);
+                            }
+                        }
+                        rowAlignmentSheet = package.Workbook.Worksheets["RowAlignment"];
+
+                        #region RawData
+                        {
+                            int rowDataStartCol = rawDataSheet.Dimension.Columns;
+                            var barcodeCell = rawDataSheet.Cells[1, rowDataStartCol + 1, 1, rowDataStartCol + 4];
+                            barcodeCell.Merge = true;
+                            barcodeCell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+                            barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
+                            SetTitleCell(barcodeCell);
+
+                            var z1Cell = rawDataSheet.Cells[2, rowDataStartCol + 1];
+                            z1Cell.Value = "Z1";
+                            SetTitleCell(z1Cell);
+
+                            var z2Cell = rawDataSheet.Cells[2, rowDataStartCol + 2];
+                            z2Cell.Value = "Z2";
+                            SetTitleCell(z2Cell);
+
+                            var z3Cell = rawDataSheet.Cells[2, rowDataStartCol + 3];
+                            z3Cell.Value = "Z3";
+                            SetTitleCell(z3Cell);
+
+                            var z4Cell = rawDataSheet.Cells[2, rowDataStartCol + 4];
+                            z4Cell.Value = "Z4";
+                            SetTitleCell(z4Cell);
+
+                            exportData.KeyUnitDataList.ForEach(k =>
+                            {
+                                int keyIndex = Config.KeyNameCollection.IndexOf(k.Key);
+                                if (keyIndex < 0)
+                                {
+                                    LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{k.Key}鐨凴awData鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
+                                    return;
+                                }
+
+                                int zIndex = int.Parse(k.MeasurementItem.Substring(1));
+
+                                var cell = rawDataSheet.Cells[keyIndex + 1 + 2, rowDataStartCol + zIndex];
+                                cell.Value = string.IsNullOrWhiteSpace(k.ItemValue) ? "NA" : k.ItemValue;
+                            });
+                        }
+                        #endregion
+
+                        #region Slant
+                        var slantMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("Slant")).ToList();
+                        if (slantMeasures.Count > 0)
+                        {
+                            int slantStartCol = slantSheet.Dimension.Columns;
+
+                            var barcodeCell = slantSheet.Cells[1, slantStartCol + 1];
+                            barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
+                            SetTitleCell(barcodeCell);
+
+                            var valueCell = slantSheet.Cells[2, slantStartCol + 1];
+                            valueCell.Value = "Value";
+                            SetTitleCell(valueCell);
+
+                            slantMeasures.ForEach(m =>
+                            {
+                                int rowIndex = Config.KeyNameCollection.IndexOf(m.Keys);
+                                if (rowIndex < 0)
+                                {
+                                    LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{m.Keys}鐨凷lant鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
+                                    return;
+                                }
+
+                                var cellValue = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 1];
+                                //var cellResult = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 2];
+
+                                cellValue.Value = m.MeasurementValue;
+                                //cellResult.Value = m.MeasurementResult;
+
+                                if (m.MeasurementResult != "OK")
+                                {
+                                    SetNGCell(cellValue);
+                                    //SetNGCell(cellResult);
+                                }
+                            });
+                        }
+                        #endregion
+
+                        #region Alignment
+                        {
+                            var alignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("Alignment")).ToList();
+                            if (alignmentMeasures.Count > 0)
+                            {
+                                List<string> keysList = new List<string>();
+                                int allRowNums = alignmentSheet.Dimension.Rows;
+                                int aligneStartCol = alignmentSheet.Dimension.Columns;
+
+                                for (int i = 3; i <= alignmentSheet.Dimension.End.Row; i++)
+                                {
+                                    string keys = alignmentSheet.Cells[i, 1].Value.ToString();
+                                    string position = alignmentSheet.Cells[i, 2].Value.ToString();
+
+                                    keysList.Add($"{keys}_{position}");
+                                }
+
+                                //var barcodeCell = alignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
+                                //barcodeCell.Merge = true;
+                                //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
+                                //SetTitleCell(barcodeCell);
+
+                                var barcodeCell = alignmentSheet.Cells[1, aligneStartCol + 1];
+                                barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
+                                SetTitleCell(barcodeCell);
+
+                                var valueCell = alignmentSheet.Cells[2, aligneStartCol + 1];
+                                valueCell.Value = "Value";
+                                SetTitleCell(valueCell);
+
+                                //var resultCell = alignmentSheet.Cells[2, aligneStartCol + 2];
+                                //resultCell.Value = "Result";
+                                //SetTitleCell(resultCell);
+
+                                alignmentMeasures.ForEach(a =>
+                                {
+                                    int rowIndex = keysList.IndexOf($"{a.Keys}_{a.Positions}");
+                                    if (rowIndex < 0)
+                                    {
+                                        LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{a.Keys}_{a.Positions}鐨凙lignment鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
+                                        return;
+                                    }
+
+                                    var cellValue = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 1];
+                                    //var cellResult = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];
+
+                                    cellValue.Value = a.MeasurementValue;
+                                    //cellResult.Value = a.MeasurementResult;
+
+                                    if (a.MeasurementResult != "OK")
+                                    {
+                                        SetNGCell(cellValue);
+                                        //SetNGCell(cellResult);
+                                    }
+                                });
+                            }
+                        }
+                        #endregion
+
+                        #region RowAlignment
+                        {
+                            var rowAlignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("RowAlignment")).ToList();
+                            if (rowAlignmentMeasures.Count > 0)
+                            {
+                                List<string> keysList = new List<string>();
+                                int allRowNums = rowAlignmentSheet.Dimension.Rows;
+                                int aligneStartCol = rowAlignmentSheet.Dimension.Columns;
+
+                                for (int i = 3; i <= allRowNums; i++)
+                                {
+                                    string keys = alignmentSheet.Cells[i, 1].Value.ToString();
+                                    string position = alignmentSheet.Cells[i, 2].Value.ToString();
+
+                                    keysList.Add($"{keys}_{position}");
+                                }
+
+                                //var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
+                                //barcodeCell.Merge = true;
+                                //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
+                                //SetTitleCell(barcodeCell);
+
+                                var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1];
+                                barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
+                                SetTitleCell(barcodeCell);
+
+                                var valueCell = rowAlignmentSheet.Cells[2, aligneStartCol + 1];
+                                valueCell.Value = "Value";
+                                SetTitleCell(valueCell);
+
+                                //var resultCell = rowAlignmentSheet.Cells[2, aligneStartCol + 2];
+                                //resultCell.Value = "Result";
+                                //SetTitleCell(resultCell);
+
+                                rowAlignmentMeasures.ForEach(a =>
+                                {
+                                    int rowIndex = keysList.IndexOf($"{a.Keys}_{a.Positions}");
+                                    if (rowIndex < 0)
+                                    {
+                                        LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{a.Keys}_{a.Positions}鐨凴owAlignment鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
+                                        return;
+                                    }
+
+                                    var cellValue = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 1];
+                                    //var cellResult = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];
+
+                                    cellValue.Value = a.MeasurementValue;
+                                    //cellResult.Value = a.MeasurementResult;
+
+                                    if (a.MeasurementResult != "OK")
+                                    {
+                                        SetNGCell(cellValue);
+                                        //SetNGCell(cellResult);
+                                    }
+                                });
+                            }
+                        }
+                        #endregion
+
+                        package.Save();
+
+                        rawDataSheet.Dispose();
+                        slantSheet.Dispose();
+                        alignmentSheet.Dispose();
+                        rowAlignmentSheet.Dispose();
+                    };
                 }
-
-                FileStream fs = new FileStream(Path.Combine(dir, $"{measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord.ProductionBarcode}_{DateTime.Now.ToString("HHmmss")}.xlsx"), FileMode.Create, FileAccess.Write);
-                fs.Write(filecontent, 0, filecontent.Length);
-                fs.Flush();
-                fs.Close();
             });
+        }
+
+        private void SetNGCell(ExcelRange cell)
+        {
+            cell.Style.Font.Color.SetColor(Color.Red);
+            cell.Style.Font.Bold = true;
+            //cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
+            //cell.Style.Fill.BackgroundColor.SetColor(Color.Red);
+        }
+
+        private void SetTitleCell(ExcelRange cell, bool isCenterAlign = true)
+        {
+            cell.Style.Font.Color.SetColor(Color.White);
+            cell.Style.Font.Bold = true;
+            cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
+            cell.Style.Fill.BackgroundColor.SetColor(Color.FromArgb(31, 73, 125));
+            cell.AutoFitColumns();
+            if (isCenterAlign)
+            {
+                cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+            }
+            else
+            {
+                cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Left;
+            }
         }
 
         #region 鍥惧儚淇濆瓨
@@ -666,128 +1199,162 @@
         }
         #endregion
 
-        private async void RunImageHandle(CameraBase camera, IOperationConfig opConfig, IImageSet imgSet, string snapshotId, string snapshotName, List<MeasurementUnit> measureList)
+        private async void RunImageHandle(IOperationConfig opConfig, IImageSet imgSet, string snapshotId, string snapshotName, List<MeasurementUnit> measureList)
         {
             await Task.Run(() =>
-             {
-                 var keys = Config.KeyUnitCollection.Where(u => u.IsEnabled && u.SnapshotPointId == snapshotId);
-                 var keyBindCollection = measureList.SelectMany(u => u.KeyUnitCollection).Where(u => keys.Any(k => k.Key == u.Key)).ToList();
+            {
+                var keys = Config.KeyUnitCollection.Where(u => u.IsEnabled && u.SnapshotPointId == snapshotId);
+                var keyBindCollection = measureList.SelectMany(u => u.KeyUnitCollection).Where(u => keys.Any(k => k.Key == u.Key)).ToList();
 
-                 string toolKey = (opConfig as CameraOprerationConfigBase).AlgorithemPath;
-                 HObject images = imgSet.HImage;
-                 LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
-                 LogAsync(DateTime.Now, $"鎵弿鍙傛暟:{imgSet.ImageData}", "");
+                if (imgSet.HImage == null)
+                {
+                    LogAsync(DateTime.Now, $"{snapshotName}鏈幏鍙栨壂鎻忓浘鍍�", "");
+                    keyBindCollection.ForEach(k => k.FillKeyValues(null));
+                    return;
+                }
 
-                 if (!string.IsNullOrWhiteSpace(toolKey))
-                 {
-                     toolKey = snapshotId + "|" + toolKey;
-                     if (!_halconToolDict.ContainsKey(toolKey))
-                     {
-                         LogAsync(DateTime.Now, $"{snapshotName}鏈垵濮嬪寲鍙栧浘绠楁硶閰嶇疆", "");
-                         keyBindCollection.ForEach(k => k.FillKeyValues(null));
-                         return;
-                     }
+                string toolKey = (opConfig as CameraOprerationConfigBase).AlgorithemPath;
 
-                     _halconToolDict[toolKey].InputImageDic["INPUT_Image"] = imgSet.HImage;
-                     if (!_halconToolDict[toolKey].RunProcedure(out string error))
-                     {
-                         LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶寮傚父锛寋error}", "");
-                         keyBindCollection.ForEach(k => k.FillKeyValues(null));
-                         return;
-                     }
+                HObject images = new HObject();
+                LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
+                LogAsync(DateTime.Now, $"鎵弿鍙傛暟:{imgSet.ImageData}", "");
 
-                     images = _halconToolDict[toolKey].GetResultObject("OUTPUT_Images");
-                 }
+                if (!string.IsNullOrWhiteSpace(toolKey))
+                {
+                    toolKey = snapshotId + "|" + toolKey;
+                    if (!_halconToolDict.ContainsKey(toolKey))
+                    {
+                        LogAsync(DateTime.Now, $"{snapshotName}鏈垵濮嬪寲鍙栧浘绠楁硶閰嶇疆", "");
+                        keyBindCollection.ForEach(k => k.FillKeyValues(null));
+                        return;
+                    }
 
-                 HOperatorSet.CountObj(images, out HTuple count);
-                 LogAsync(DateTime.Now, $"{snapshotName}鍒囧浘{count.I}寮�", "");
+                    //string fileName = Path.Combine(Config.ImageSaveFolder, "BeforeRun", $"{DateTime.Now.ToString("yyyyMMddHHmmssfff")}.tif");
+                    //imgSet.HImage.WriteImage("tiff", 0, fileName);
 
-                 if (count == 0)
-                 {
-                     LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶鏈緭鍑哄浘鍍�", "");
-                     keyBindCollection.ForEach(k => k.FillKeyValues(null));
-                     return;
-                 }
+                    if (imgSet.HImage == null)
+                    {
+                        LogAsync(DateTime.Now, $"{snapshotName}鍥剧墖涓虹┖瀵硅薄", "");
+                        keyBindCollection.ForEach(k => k.FillKeyValues(null));
+                        return;
+                    }
 
-                 var excludeKeys = keys.Where(u => u.ImageSeq > count.I).ToList();
-                 if (excludeKeys.Count > 0)
-                 {
-                     LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AliasName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
-                     keyBindCollection.Where(k => excludeKeys.Any(u => u.Key == k.Key)).ToList().ForEach(k =>
-                          {
-                              k.FillKeyValues(null);
-                          });
-                 }
+                    _halconToolDict[toolKey].InputImageDic["INPUT_Image"] = imgSet.HImage;
+                    if (!_halconToolDict[toolKey].RunProcedure(out string error))
+                    {
+                        LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶寮傚父锛寋error}", "");
+                        keyBindCollection.ForEach(k => k.FillKeyValues(null));
+                        return;
+                    }
 
-                 string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
-                 if (!Directory.Exists(dir))
-                 {
-                     Directory.CreateDirectory(dir);
-                 }
+                    images = _halconToolDict[toolKey].GetResultObject("OUTPUT_Images");
+                }
 
-                 Parallel.For(1, count.I + 1, (i) =>
-                 //for (int i = 1; i <= count.I; i++)
-                 {
-                     HOperatorSet.SelectObj(images, out HObject image, i);
+                HOperatorSet.CountObj(images, out HTuple count);
+                LogAsync(DateTime.Now, $"{snapshotName}鍒囧浘{count.I}寮�", "");
 
-                     string fileName = Path.Combine(dir, $"{i}.tif");
-                     image.ConvertHObjectToHImage().WriteImage("tiff", 0, fileName);
+                if (count == 0)
+                {
+                    LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶鏈緭鍑哄浘鍍�", "");
+                    keyBindCollection.ForEach(k => k.FillKeyValues(null));
+                    return;
+                }
 
-                     keys.Where(u => u.ImageSeq == i).ToList().ForEach(k =>
-                         {
-                             Dictionary<string, double> resultDict = null;
+                var excludeKeys = keys.Where(u => u.ImageSeq > count.I).ToList();
+                if (excludeKeys.Count > 0)
+                {
+                    LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AliasName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
+                    keyBindCollection.Where(k => excludeKeys.Any(u => u.Key == k.Key)).ToList().ForEach(k =>
+                    {
+                        k.FillKeyValues(null);
+                    });
+                }
 
-                             var keyBindList = keyBindCollection.Where(u => u.Key == k.Key).ToList();
+                //string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{DateTime.Now.ToString("yyyyMMdd")}", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
+                //if (!Directory.Exists(dir))
+                //{
+                //    Directory.CreateDirectory(dir);
+                //}
 
-                             string keyToolKey = k.AliasName + "|" + k.KeyAlgorithemPath;
-                             if (!_halconToolDict.ContainsKey(keyToolKey))
-                             {
-                                 LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曟湭鍒濆鍖�", "");
-                             }
-                             else
-                             {
-                                 _halconToolDict[keyToolKey].InputImageDic["INPUT_Image"] = image;
-                                 _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_X"] = scanParam.Resolution_X / 1000000.0;
-                                 _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z / 1000000.0;
-                                 if (!_halconToolDict[keyToolKey].RunProcedure(out string error))
-                                 {
-                                     LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
-                                 }
-                                 else
-                                 {
-                                     var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").HTupleToDouble();
-                                     if (results.Count == 0 || results.Any(u => u < 0))
-                                     {
-                                         LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬粨鏋滃紓甯�", "");
-                                     }
-                                     else
-                                     {
-                                         resultDict = k.KeyResultList.ToDictionary(u => u, u =>
-                                              {
-                                                  int index = k.KeyResultList.IndexOf(u);
-                                                  return results[index];
-                                              });
-                                     }
-                                 }
-                             }
+                //Parallel.For(1, count.I + 1, (i) =>
+                for (int i = 1; i <= count.I; i++)
+                {
+                    HOperatorSet.SelectObj(images, out HObject image, i);
 
-                             keyBindList.ForEach(kb =>
-                             {
-                                 kb.KeyImages.Add(image.ConvertHObjectToHImage());
-                                 kb.FillKeyValues(resultDict);
-                             });
-                         });
+                    //string fileName = Path.Combine(dir, $"{i}.tif");
+                    //using (HImage temp = image.ConvertHObjectToHImage())
+                    //{
+                    //    temp.WriteImage("tiff", 0, fileName);
+                    //}
 
-                     //image.Dispose();
-                 }
-                 );
+                    keys.Where(u => u.ImageSeq == i).ToList().ForEach(k =>
+                    {
+                        Dictionary<string, double> resultDict = null;
 
-                 //if (count.I != 1)
-                 //{
-                 //    hImage?.Dispose();
-                 //    hImage = null;
-                 //}
-             });
+                        var keyBindList = keyBindCollection.Where(u => u.Key == k.Key).ToList();
+
+                        string keyToolKey = k.AliasName + "|" + k.KeyAlgorithemPath;
+                        if (!_halconToolDict.ContainsKey(keyToolKey))
+                        {
+                            LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曟湭鍒濆鍖�", "");
+                        }
+                        else
+                        {
+                            _halconToolDict[keyToolKey].InputImageDic["INPUT_Image"] = image;
+                            _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_X"] = scanParam.Resolution_X / 1000000.0;
+                            _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Y"] = scanParam.Resolution_Y / 1000000.0;
+                            _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z / 1000000.0;
+                            _halconToolDict[keyToolKey].InputTupleDic["INPUT_ImageId"] = $"{k.AliasName}_{DateTime.Now.ToString("HHmmssfff")}.tif";
+                            if (!_halconToolDict[keyToolKey].RunProcedure(out string error))
+                            {
+                                LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
+                            }
+                            else
+                            {
+                                var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").DArr.ToList();
+                                if (results.Count == 0 || results.Any(u => u < 0))
+                                {
+                                    LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁寮傚父", "");
+                                }
+                                else
+                                {
+                                    //LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁", $"{string.Join(" ", results)}");
+
+                                    results = results.Select(u => u - Config.PlanCompensation).ToList();
+                                    resultDict = k.KeyResultList.ToDictionary(u => u, u =>
+                                    {
+                                        int index = k.KeyResultList.IndexOf(u);
+                                        return results[index];
+                                    });
+                                }
+                            }
+                        }
+
+                        keyBindList.ForEach(kb =>
+                        {
+                            kb.KeyImages.Add(image.ConvertHObjectToHImage());
+                            kb.FillKeyValues(resultDict);
+                        });
+                    });
+
+                    image.Dispose();
+                    image = null;
+                }
+                //);
+
+                imgSet.HImage.Dispose();
+                imgSet.HImage = null;
+                imgSet.Dispose();
+
+                images.Dispose();
+                images = null;
+
+                //if (count.I != 1)
+                //{
+                //    hImage?.Dispose();
+                //    hImage = null;
+                //}
+            });
         }
         #endregion
     }

--
Gitblit v1.8.0