现场修改

patrick.xu

2021-09-15 8bd46da0c9fbfe39a65d75b1d85692d8783f5905

 src/Bro.M071.Process/M071Process.cs

@@ -2,7 +2,7 @@
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;
@@ -14,10 +14,12 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -46,30 +48,46 @@
        public event Action<IShapeElement> OnElementUpdated;
        public event Action<MachineState> OnMachineStateChanged;
        public event Action OnFullResetDone;
        public event Action OnResetDone;
        #endregion

        string _precision = "f3";

        double _allowedShift = 0;

        public override void Open()
        {
            InitialSetting();

            base.Open();
            if (!Config.IsOfflineMode)
            {
                base.Open();

            InitialMotionCardBaseAxisAlarm();
                InitialMotionCardBaseAxisAlarm();

            SwitchBeep(false);
            SwitchLightGreen(false);
            SwitchLightRed(false);
            SwitchLightYellow(false);
                SwitchBeep(false);
                SwitchLightGreen(false);
                SwitchLightRed(false);
                SwitchLightYellow(false);

            Reset(null, null, null);
            FullReset(null);
                Reset(null, null, null);
                FullReset(null);
            }

            if (Config.Precision > 0)
            {
                _precision = "f" + Config.Precision;
            }

            if (Config.IsEnableMESUpload)
            {
                IncomingCheckMethod = InitialMESWebServiceMethod(IncomingCheckMethodName, out IncomingCheckObj);
                DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
            }

            var allowedShiftStr = ConfigurationManager.AppSettings["DataShift"];
            if (!double.TryParse(allowedShiftStr, out _allowedShift))
            {
                _allowedShift = 0;
            }
        }

@@ -183,9 +201,42 @@
        }
        #endregion

        public string BarCode { get; set; }

        AutoResetEvent _jobDoneHandle = new AutoResetEvent(false);
        [ProcessMethod("ManualTest", "ManualTest", "手动测试", InvokeType.TestInvoke)]
        public ProcessResponse ManualTest(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
        {
            if (config is ManualTestOperationConfig opConfig)
            {
                Task.Run(async () =>
                {
                    for (int i = 0; i < opConfig.RepeatTimes; i++)
                    {
                        BarCode = $"Test_{i + 1}";
                        StartJob(null, null, null);

                        if (_jobDoneHandle.WaitOne(20000))
                        {
                            LogAsync(DateTime.Now, $"第{i + 1}次任务完成", "");
                            await Task.Delay(500);
                        }
                        else
                        {
                            LogAsync(DateTime.Now, $"第{i + 1}次任务超时", "");
                            break;
                        }
                    }
                });
            }

            return new ProcessResponse(true);
        }

        object productionLock = new object();
        List<ProductionMeasurement> productionList = new List<ProductionMeasurement>();

        bool _isdoing = false;
        object _doingLock = new object();

        [ProcessMethod("", "StartJob", "开始扫描", InvokeType.TestInvoke)]
        public ProcessResponse StartJob(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
@@ -195,22 +246,51 @@
                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;
            lock (_doingLock)
            {
                if (_isdoing)
                {
                    LogAsync(DateTime.Now, "设备正在运行中", "");
                    return new ProcessResponse(true);
                }

                _isdoing = true;
            }

            MeasureState = MachineState = MachineState.Running;

            OnCheckHintUpload?.Invoke(hint, true);
            OnMeasureStart?.Invoke();

            var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
            measurements.ForEach(m =>
            //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()
@@ -220,20 +300,27 @@
                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 =>
            try
            {
                Config.SnapshotPointCollection.Where(u => u.IsEnabled).ToList().ForEach(s =>
                  {
                      _pausedHandle.Wait();

@@ -282,22 +369,43 @@

                      RunImageHandle(s.CameraOp.OpConfig, set, s.Id, s.Name, pMeasure.Measurements);
                  });
            }
            catch (Exception ex)
            {
                throw ex;
            }
            finally
            {
                LogAsync(DateTime.Now, $"{pMeasure.Barcode}测量动作完成", "");
                _isdoing = false;

            BarCode = "";
            LogAsync(DateTime.Now, $"{pMeasure.Barcode}测量动作完成", "");
                GC.Collect(0, GCCollectionMode.Optimized);
            }

            return new ProcessResponse(true);
        }

        #region 双手启动
        object _leftStartLock = new object();
        object _rightStartLock = new object();

        bool isLeftStart = false;
        bool IsLeftStart
        {
            get => isLeftStart;
            set
            {
                isLeftStart = value;
                StartCheck();
                if (isLeftStart != value)
                {
                    lock (_leftStartLock)
                    {
                        if (IsLeftStart != value)
                        {
                            isLeftStart = value;
                            StartCheck();
                        }
                    }
                }
            }
        }

@@ -307,8 +415,17 @@
            get => isRightStart;
            set
            {
                isRightStart = value;
                StartCheck();
                if (isRightStart != value)
                {
                    lock (_rightStartLock)
                    {
                        if (isRightStart != value)
                        {
                            isRightStart = value;
                            StartCheck();
                        }
                    }
                }
            }
        }

@@ -316,6 +433,11 @@
        {
            if (isRightStart && isLeftStart)
            {
                if (_isdoing)
                {
                    OnCheckHintUpload?.Invoke("设备运行中", false);
                    return;
                }
                StartJob(null, null, null);
            }
        }
@@ -341,6 +463,116 @@

            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)}，Y方向极差：{diffY.ToString(_precision)}", "");
                                    }
                                }
                            }
                        }
                    }
                });
            }

            return new ProcessResponse();
        }

        [ProcessMethod("KeyUnitGenerate", "GenerateKeyUnitByKeyNames", "生成单键配置", InvokeType.TestInvoke)]
        public ProcessResponse GenerateKeyUnitByKeyNames(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
            if (opConfig is KeyUnitGenerateConfig config)
            {
                int i = 1;
                bool isStart = false;
                bool isEnd = false;
                foreach (string k in Config.KeyNameCollection)
                {
                    if (k == config.StartKey)
                    {
                        isStart = true;
                    }
                    else if (k == config.EndKey)
                    {
                        isEnd = true;
                    }

                    if (isStart)
                    {
                        KeyUnit unit = new KeyUnit();
                        unit.Key = unit.AliasName = k;
                        unit.SnapshotPointId = config.SnapshotPointId;
                        unit.KeyAlgorithemId = config.KeyAlgorithemId;
                        unit.KeyResultId = config.KeyResultId;
                        unit.ImageSeq = i;

                        Config.KeyUnitCollection.Add(unit);
                        i++;
                    }

                    if (isEnd)
                    {
                        break;
                    }
                }
            }

            return new ProcessResponse(true);
        }
        #endregion

        #region 私有方法
@@ -348,9 +580,13 @@
        {
            if (sender is ProductionMeasurement pMeasure)
            {
                var production = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
                if (production == null)
                    return;
                ProductionMeasurement production = null;
                lock (productionLock)
                {
                    production = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
                    if (production == null)
                        return;
                }

                lock (production)
                {
@@ -363,7 +599,8 @@
                            {
                                if (m.KeyUnitCollection.Any(k => k.IsDone == false))
                                {
                                    m.Spec.ActualValue = -999;
                                    //m.Spec.ActualValue = -999;
                                    m.Spec.ActualValue = null;
                                }
                                else
                                {
@@ -371,7 +608,8 @@
                                    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
                                    {
@@ -381,30 +619,43 @@
                                        if (array == null || array.Length == 0)
                                        {
                                            LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}未能获取对应检测值", "");
                                            m.Spec.ActualValue = -999;
                                            //m.Spec.ActualValue = -999;
                                            m.Spec.ActualValue = null;
                                        }
                                        else
                                        {

                                            _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 = -999;
                                                m.Spec.ActualValue = null;
                                            }
                                            else
                                            {
                                                m.Spec.ActualValue = double.Parse(_halconToolDict[toolKey].GetResultTuple("OUTPUT_Result").D.ToString(_precision));
                                                //LogAsync(DateTime.Now, $"{m.GetDisplayText()}数据{m.Spec.ActualValue}，结果{(m.Spec.MeasureResult == null ? "TBD" : (m.Spec.MeasureResult == true ? "OK" : "NG"))}", "");
                                                double actualValue = double.Parse(_halconToolDict[toolKey].GetResultTuple("OUTPUT_Result").D.ToString(_precision));
                                                m.Spec.ActualValue = actualValue;

                                                if (m.MeasureType.ToLower() == "alignment" || m.MeasureType.ToLower() == "slant")
                                                {
                                                    //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")}");
                                if (m.Spec?.ActualValue != null)
                                {
                                    LogAsync(DateTime.Now, $"{m.Name}检测结果{m.Spec.ActualValue.Value.ToString(_precision)}", "");
                                }

                                KeyIndicator indicator = new KeyIndicator(m.Id, m.DisplayLocation);
                                indicator.Text = (m.Spec.ActualValue == null || m.Spec.ActualValue == -999) ? "NA" : m.Spec.ActualValue.Value.ToString(_precision);
                                indicator.Text = m.Spec.ActualValue == null ? "NA" : m.Spec.ActualValue.Value.ToString(_precision);
                                indicator.ResultState = m.Spec.MeasureResult;
                                pMeasure.ElementList.Add(indicator);
                                //输出图形基元到界面 
@@ -424,21 +675,55 @@
                }

                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;

                MeasureState = MachineState.Ready;
                if (MachineState != MachineState.Alarm)
                {
                    if (MachineState == MachineState.Pause)
                    {
                        _machineStateBeforePause = MachineState.Ready;
                    }
                    else
                    {
                        MachineState = MachineState.Ready;
                    }
                }

                _jobDoneHandle.Set();

                var measurementUnitResultAndKeyUnitDataSet = GetMeasurementUnitResultAndKeyUnitData(pMeasure);

                //MES输出 todo
                if (Config.IsEnableMESUpload)
                if (pMeasure.PResult != "NA")
                {
                    //MES输出
                    MESCheckDataUpload(pMeasure);
                }

                //Excel报表输出 （单个产品的excel导出）
@@ -450,49 +735,53 @@

                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)
        {
@@ -525,19 +814,19 @@
                    measurementUnitResult.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
                    measurementUnitResult.MeasurementName = measurementUnit.GetDisplayText();

                    if (measurementUnit.MeasureType == "Alignment" || measurementUnit.MeasureType == "Slant")
                    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 == "RowAlignment")
                    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.Value ? "OK" : "NG";
                    measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult == null ? "NA" : measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";

                    measurementUnitResults.Add(measurementUnitResult);

@@ -575,51 +864,52 @@
            return measurementUnitResultAndKeyUnitDataSet;
        }

        private async void ExportProductionExcel(ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet)
        {
            if (!Config.IsCSVOutputEnabled)
                return;
        //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;
        //    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); ;
        //        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");
        //        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();
            });
        }
        //        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();
        string fileName = "";
        private async void ExportProductionInColumns(ProductionMeasurementUnitResultAndKeyUnitDataSet exportData)
        {
            if (!Config.IsCSVOutputEnabled)
@@ -633,311 +923,320 @@
                    {
                        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)))

                    if (string.IsNullOrWhiteSpace(fileName))
                    {
                        ExcelWorksheet rawDataSheet = null;
                        ExcelWorksheet slantSheet = null;
                        ExcelWorksheet alignmentSheet = null;
                        ExcelWorksheet rowAlignmentSheet = null;
                        fileName = Path.Combine(Config.LogPath, $"LDSData_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.xlsx");
                    }

                        if (!package.Workbook.Worksheets.Any(s => s.Name == "RawData"))
                    try
                    {
                        using (ExcelPackage package = new ExcelPackage(new FileInfo(fileName)))
                        {
                            package.Workbook.Worksheets.Add("RawData");
                            rawDataSheet = package.Workbook.Worksheets["RawData"];
                            for (int i = 0; i < Config.KeyNameCollection.Count; i++)
                            ExcelWorksheet rawDataSheet = null;
                            ExcelWorksheet slantSheet = null;
                            ExcelWorksheet alignmentSheet = null;
                            ExcelWorksheet rowAlignmentSheet = null;

                            if (!package.Workbook.Worksheets.Any(s => s.Name == "RawData"))
                            {
                                var cell = rawDataSheet.Cells[i + 3, 1];
                                cell.Value = Config.KeyNameCollection[i];
                                SetTitleCell(cell, false);
                                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"];
                            rawDataSheet = package.Workbook.Worksheets["RawData"];

                        if (!package.Workbook.Worksheets.Any(s => s.Name == "Slant"))
                        {
                            package.Workbook.Worksheets.Add("Slant");
                            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"];

                            var keyCell = slantSheet.Cells[2, 1];
                            keyCell.Value = "Key";
                            SetTitleCell(keyCell);

                            for (int i = 0; i < Config.KeyNameCollection.Count; i++)
                            if (!package.Workbook.Worksheets.Any(s => s.Name == "Alignment"))
                            {
                                var cell = slantSheet.Cells[i + 3, 1];
                                cell.Value = Config.KeyNameCollection[i];
                                SetTitleCell(cell, false);
                            }
                        }
                        slantSheet = package.Workbook.Worksheets["Slant"];
                                package.Workbook.Worksheets.Add("Alignment");
                                alignmentSheet = package.Workbook.Worksheets["Alignment"];

                        if (!package.Workbook.Worksheets.Any(s => s.Name == "Alignment"))
                        {
                            package.Workbook.Worksheets.Add("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"];

                            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 == "Alignment").ToList();
                            for (int i = 0; i < alignmentMeasures.Count(); i++)
                            if (!package.Workbook.Worksheets.Any(s => s.Name == "RowAlignment"))
                            {
                                var cellKeys = alignmentSheet.Cells[i + 3, 1];
                                cellKeys.Value = alignmentMeasures[i].Keys;
                                SetTitleCell(cellKeys, false);
                                package.Workbook.Worksheets.Add("RowAlignment");
                                rowAlignmentSheet = package.Workbook.Worksheets["RowAlignment"];

                                var cellPosition = alignmentSheet.Cells[i + 3, 2];
                                cellPosition.Value = alignmentMeasures[i].Positions;
                                SetTitleCell(cellPosition, false);
                                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);
                                }
                            }
                        }
                        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 == "RowAlignment").ToList();
                            for (int i = 0; i < rowAlignmentMeasures.Count(); i++)
                            #region RawData
                            {
                                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
                        {
                            //rawDataSheet = package.Workbook.Worksheets["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}的RawData未能获取行信息，未导出");
                                    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 == "Slant").ToList();
                        if (slantMeasures.Count > 0)
                        {
                            int slantStartCol = slantSheet.Dimension.Columns;

                            //var barcodeCell = slantSheet.Cells[1, slantStartCol + 1, 1, slantStartCol + 2];
                            //barcodeCell.Merge = true;
                            //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
                            //SetTitleCell(barcodeCell);

                            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);

                            //var resultCell = slantSheet.Cells[2, slantStartCol + 2];
                            //resultCell.Value = "Result";
                            //SetTitleCell(resultCell);

                            slantMeasures.ForEach(m =>
                            {
                                int rowIndex = Config.KeyNameCollection.IndexOf(m.Keys);
                                if (rowIndex < 0)
                                {
                                    LogAsync(DateTime.Now, "Excel导出错误", $"{m.Keys}的Slant未能获取行信息，未导出");
                                    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 == "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];
                                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 valueCell = alignmentSheet.Cells[2, aligneStartCol + 1];
                                valueCell.Value = "Value";
                                SetTitleCell(valueCell);
                                var z1Cell = rawDataSheet.Cells[2, rowDataStartCol + 1];
                                z1Cell.Value = "Z1";
                                SetTitleCell(z1Cell);

                                //var resultCell = alignmentSheet.Cells[2, aligneStartCol + 2];
                                //resultCell.Value = "Result";
                                //SetTitleCell(resultCell);
                                var z2Cell = rawDataSheet.Cells[2, rowDataStartCol + 2];
                                z2Cell.Value = "Z2";
                                SetTitleCell(z2Cell);

                                alignmentMeasures.ForEach(a =>
                                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 rowIndex = keysList.IndexOf($"{a.Keys}_{a.Positions}");
                                    if (rowIndex < 0)
                                    int keyIndex = Config.KeyNameCollection.IndexOf(k.Key);
                                    if (keyIndex < 0)
                                    {
                                        LogAsync(DateTime.Now, "Excel导出错误", $"{a.Keys}_{a.Positions}的Alignment未能获取行信息，未导出");
                                        LogAsync(DateTime.Now, "Excel导出错误", $"{k.Key}的RawData未能获取行信息，未导出");
                                        return;
                                    }

                                    var cellValue = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 1];
                                    //var cellResult = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];
                                    int zIndex = int.Parse(k.MeasurementItem.Substring(1));

                                    cellValue.Value = a.MeasurementValue;
                                    //cellResult.Value = a.MeasurementResult;
                                    var cell = rawDataSheet.Cells[keyIndex + 1 + 2, rowDataStartCol + zIndex];
                                    cell.Value = string.IsNullOrWhiteSpace(k.ItemValue) ? "NA" : k.ItemValue;
                                });
                            }
                            #endregion

                                    if (a.MeasurementResult != "OK")
                            #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}的Slant未能获取行信息，未导出");
                                        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
                            #endregion

                        #region RowAlignment
                        {
                            var rowAlignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType == "RowAlignment").ToList();
                            if (rowAlignmentMeasures.Count > 0)
                            #region Alignment
                            {
                                List<string> keysList = new List<string>();
                                int allRowNums = rowAlignmentSheet.Dimension.Rows;
                                int aligneStartCol = rowAlignmentSheet.Dimension.Columns;

                                for (int i = 3; i <= allRowNums; i++)
                                var alignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("Alignment")).ToList();
                                if (alignmentMeasures.Count > 0)
                                {
                                    string keys = alignmentSheet.Cells[i, 1].Value.ToString();
                                    string position = alignmentSheet.Cells[i, 2].Value.ToString();
                                    List<string> keysList = new List<string>();
                                    int allRowNums = alignmentSheet.Dimension.Rows;
                                    int aligneStartCol = alignmentSheet.Dimension.Columns;

                                    keysList.Add($"{keys}_{position}");
                                    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}的Alignment未能获取行信息，未导出");
                                            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);
                                        }
                                    });
                                }

                                //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}的RowAlignment未能获取行信息，未导出");
                                        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
                            #endregion

                        package.Save();
                    };
                            #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}的RowAlignment未能获取行信息，未导出");
                                            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();
                        };
                    }
                    catch (Exception ex)
                    {
                        LogAsync(DateTime.Now, "Excel日志异常", ex.GetExceptionMessage());
                        fileName = Path.Combine(Config.LogPath, $"LDSData_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.xlsx");
                        //string bkFileName = Path.Combine(Config.LogPath, $"{Path.GetFileNameWithoutExtension(fileName)}_bk_{DateTime.Now.ToString("HHmmss")}.xlsx");
                        //File.Copy(fileName, bkFileName);
                        //File.Delete(fileName);
                    }
                }
            });
        }
@@ -1058,6 +1357,8 @@
        }
        #endregion

        static object _resultCalcLock = new object();

        private async void RunImageHandle(IOperationConfig opConfig, IImageSet imgSet, string snapshotId, string snapshotName, List<MeasurementUnit> measureList)
        {
            await Task.Run(() =>
@@ -1065,8 +1366,14 @@
                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();

                if (imgSet.HImage == null)
                {
                    LogAsync(DateTime.Now, $"{snapshotName}未获取扫描图像", "");
                    keyBindCollection.ForEach(k => k.FillKeyValues(null));
                    return;
                }

                string toolKey = (opConfig as CameraOprerationConfigBase).AlgorithemPath;
                //HObject images = imgSet.HImage;

                HObject images = new HObject();
                LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
@@ -1129,73 +1436,111 @@
                //    Directory.CreateDirectory(dir);
                //}

                //Parallel.For(1, count.I + 1, (i) =>
                for (int i = 1; i <= count.I; i++)
                lock (_resultCalcLock)
                {
                    HOperatorSet.SelectObj(images, out HObject image, i);

                    //string fileName = Path.Combine(dir, $"{i}.tif");
                    //using (HImage temp = image.ConvertHObjectToHImage())
                    //{
                    //    temp.WriteImage("tiff", 0, fileName);
                    //}

                    keys.Where(u => u.ImageSeq == i).ToList().ForEach(k =>
                    //Parallel.For(1, count.I + 1, (i) =>
                    for (int i = 1; i <= count.I; i++)
                    {
                        Dictionary<string, double> resultDict = null;
                        HOperatorSet.SelectObj(images, out HObject image, i);

                        var keyBindList = keyBindCollection.Where(u => u.Key == k.Key).ToList();
                        //string fileName = Path.Combine(dir, $"{i}.tif");
                        //using (HImage temp = image.ConvertHObjectToHImage())
                        //{
                        //    temp.WriteImage("tiff", 0, fileName);
                        //}

                        string keyToolKey = k.AliasName + "|" + k.KeyAlgorithemPath;
                        if (!_halconToolDict.ContainsKey(keyToolKey))
                        keys.Where(u => u.ImageSeq == i).ToList().ForEach(k =>
                        {
                            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))
                            Dictionary<string, double> resultDict = 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}检测算法异常，{error}", "");
                                LogAsync(DateTime.Now, $"{k.AliasName}检测算法未初始化", "");
                            }
                            else
                            {
                                var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").DArr.ToList();
                                if (results.Count == 0 || results.Any(u => u < 0))
                                _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}原始数据异常", "");
                                    LogAsync(DateTime.Now, $"{k.AliasName}检测算法异常，{error}", "");
                                }
                                else
                                {
                                    //LogAsync(DateTime.Now, $"{k.AliasName}原始数据", $"{string.Join(" ", results)}");

                                    results = results.Select(u => u - Config.PlanCompensation).ToList();
                                    resultDict = k.KeyResultList.ToDictionary(u => u, u =>
                                    var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").DArr.ToList();
                                    if (results.Count == 0 || results.Any(u => u < 0))
                                    {
                                        int index = k.KeyResultList.IndexOf(u);
                                        return results[index];
                                    });
                                        LogAsync(DateTime.Now, $"{k.AliasName}原始数据{string.Join(",", results)}异常", "");
                                    }
                                    else
                                    {
                                        //LogAsync(DateTime.Now, $"{k.AliasName}原始数据", $"{string.Join(" ", results)}");

                                        results = results.Select(u => u - Config.PlanCompensation).ToList();

                                        string resultStr = "";
                                        resultDict = k.KeyResultList.ToDictionary(u => u, u =>
                                        {
                                            int index = k.KeyResultList.IndexOf(u);

                                            if (index < results.Count && index >= 0)
                                            {
                                                double origin = results[index];

                                                var compensation = k.KeyCompensationCollection.FirstOrDefault(c => c.KeyResult == u);
                                                if (compensation != null)
                                                {
                                                    origin = origin + compensation.Compensation;
                                                }

                                                resultStr += $"{u} {origin};";

                                                return origin;
                                            }
                                            else
                                            {
                                                return -999.0;
                                            }
                                        });

                                        LogAsync(DateTime.Now, $"{k.AliasName}结果：{resultStr}", "");
                                    }
                                }
                            }
                        }

                        keyBindList.ForEach(kb =>
                        {
                            kb.KeyImages.Add(image.ConvertHObjectToHImage());
                            kb.FillKeyValues(resultDict);
                            keyBindList.ForEach(kb =>
                            {
                                if (kb.KeyImages != null)
                                {
                                    kb.KeyImages.Add(image.ConvertHObjectToHImage());
                                    kb.FillKeyValues(resultDict);
                                }
                                else
                                {

                                }
                            });
                        });
                    });

                    image.Dispose();
                        image.Dispose();
                        image = null;
                    }
                    //);
                }
                //);

                imgSet.HImage.Dispose();
                imgSet.HImage = null;
                imgSet.Dispose();

                images.Dispose();
                images = null;

                //if (count.I != 1)
                //{
                //    hImage?.Dispose();