M071.git - Gitblit

			@@ -2,14 +2,20 @@
			using Bro.Common.Helper;
			using Bro.Common.Interface;
			using Bro.Common.Model;
			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.Drawing;
			using System.Drawing.Imaging;
			using System.IO;
			using System.Linq;
			using System.Text;
			@@ -48,6 +54,8 @@

			base.Open();

			InitialMotionCardBaseAxisAlarm();

			SwitchBeep(false);
			SwitchLightGreen(false);
			SwitchLightRed(false);
			@@ -57,9 +65,24 @@
			FullReset(null);
			}

			private void InitialMotionCardBaseAxisAlarm()
			{
			if (outputCtrlCard != null)
			{
			outputCtrlCard.OnAxisAlarmRaised -= MotionCard_OnAxisAlarmRaised;
			outputCtrlCard.OnAxisAlarmRaised += MotionCard_OnAxisAlarmRaised;
			}
			}

			private void MotionCard_OnAxisAlarmRaised(int axisIndex, string alarmMsg)
			{
			RaisedAlarm(alarmMsg);
			MachineState = MachineState.Alarm;
			}

			private void InitialSetting()
			{
			////数据库迁移检查
			//数据库迁移检查
			//DatabaseInitialize.Initialize();

			MotionCardSettingCheck();
			@@ -159,6 +182,11 @@
			[ProcessMethod("", "StartJob", "开始扫描", InvokeType.TestInvoke)]
			public ProcessResponse StartJob(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
			{
			if (!IsAllowedWork)
			{
			throw new ProcessException(SafetyMsg, null, ExceptionLevel.Fatal);
			}

			if (MachineState != MachineState.Ready)
			throw new ProcessException("机台未就绪，请勿开始测量", null, ExceptionLevel.Fatal);

			@@ -169,7 +197,7 @@
			}

			MachineState = MachineState.Running;
			OnMeasureStart?.BeginInvoke(null, null);
			OnMeasureStart?.Invoke();

			var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
			measurements.ForEach(m =>
			@@ -199,7 +227,15 @@

			Config.SnapshotPointCollection.Where(u => u.IsEnabled).ToList().ForEach(s =>
			{
			_pauseHandle.WaitHandle.WaitOne();
			_pausedHandle.Wait();

			if (MachineState == MachineState.Ready)
			return;

			if (MachineState != MachineState.Running && MachineState != MachineState.Pause)
			{
			throw new ProcessException("机台状态不在运行中，退出检测");
			}

			IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == s.MotionOp.Device);
			if (device == null)
			@@ -236,7 +272,7 @@
			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 = "";
			@@ -304,10 +340,14 @@
			{
			if (sender is ProductionMeasurement pMeasure)
			{
			lock (pMeasure)
			var production = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
			if (production == null)
			return;

			lock (production)
			{
			//检查是否全部完成
			pMeasure.Measurements.ForEach(m =>
			pMeasure.Measurements?.ForEach(m =>
			{
			if (m.KeyUnitCollection.All(k => k.IsDone != null))
			{
			@@ -336,18 +376,20 @@
			}
			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"))}", "");
			m.Spec.ActualValue = double.Parse(_halconToolDict[toolKey].GetResultTuple("OUTPUT_Result").D.ToString("f2"));
			//LogAsync(DateTime.Now, $"{m.GetDisplayText()}数据{m.Spec.ActualValue}，结果{(m.Spec.MeasureResult == null ? "TBD" : (m.Spec.MeasureResult == true ? "OK" : "NG"))}", "");
			}
			}
			}

			LogAsync(DateTime.Now, $"{m.GetDisplayText()}检测结果", $"{((m.Spec.MeasureResult ?? false) ? "OK" : "NG")}");
			//LogAsync(DateTime.Now, $"{m.GetDisplayText()}检测结果", $"{((m.Spec.MeasureResult ?? false) ? "OK" : "NG")}");

			IShapeElement indicator = null;
			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.ResultState = m.Spec.MeasureResult;
			pMeasure.ElementList.Add(indicator);
			//输出图形基元到界面 todo
			OnElementUpdated?.BeginInvoke(indicator, null, null);
			//输出图形基元到界面
			OnElementUpdated?.Invoke(indicator);

			SaveKeyImages(pMeasure.Barcode, m);

			@@ -364,24 +406,545 @@

			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);
			OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);

			LogAsync(DateTime.Now, $"{pMeasure.Barcode} 检测完成，结果 {(pResult ? "OK" : "NG")}", "");
			LogAsync(DateTime.Now, $"{pMeasure.Barcode} 检测完成，结果 {pMeasure.PResult}", "");

			if (MachineState == MachineState.Running)
			MachineState = MachineState.Ready;

			var measurementUnitResultAndKeyUnitDataSet = GetMeasurementUnitResultAndKeyUnitData(pMeasure);

			//MES输出 todo
			if (Config.IsEnableMESUpload)
			{
			}

			//Excel报表输出 todo
			//Excel报表输出（单个产品的excel导出）
			//ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);

			//数据库保存 todo
			ExportProductionInColumns(measurementUnitResultAndKeyUnitDataSet);
			////数据库保存
			//SaveProductionData(measurementUnitResultAndKeyUnitDataSet);

			SaveWholeImage(pMeasure);

			productionList.RemoveAll(p => p.Barcode == pMeasure.Barcode);
			pMeasure.Dispose();
			}
			}

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

			// 获取原始数据并保存
			var keyUnitDatas = measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList;
			keyUnitDataManager.BatchAddKeyUnitData(keyUnitDatas);

			// 获取检测结果数据并保存
			var measurementUnitResults = measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList;
			measurementUnitResultManager.BatchAddMeasurementUnitResult(measurementUnitResults);

			// 获取关系数据并保存
			var measurementAndKeyDataRelationList = measurementUnitResultAndKeyUnitDataSet.MeasurementAndKeyDataRelationList;
			measurementAndKeyDataRelationManager.BatchAddMeasurementAndKeyDataRelation(measurementAndKeyDataRelationList);
			}
			}
			catch (Exception ex)
			{
			LogAsync(DateTime.Now, "数据保存异常", ex.GetExceptionMessage());
			}
			});
			}

			private ProductionMeasurementUnitResultAndKeyUnitDataSet GetMeasurementUnitResultAndKeyUnitData(ProductionMeasurement pData)
			{
			ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet = new ProductionMeasurementUnitResultAndKeyUnitDataSet();

			try
			{

			//产品数据
			ProductionMeasurementRecords productionMeasurementRecords = new ProductionMeasurementRecords();
			//关系数据
			List<MeasurementAndKeyDataRelation> measurementAndKeyDataRelationList = new List<MeasurementAndKeyDataRelation>();
			//原始数据
			List<KeyUnitData> keyUnitDatas = new List<KeyUnitData>();
			// 单个产品的测量汇总
			List<MeasurementUnitResult> measurementUnitResults = new List<MeasurementUnitResult>();

			productionMeasurementRecords.ProductionBarcode = pData.Barcode;
			productionMeasurementRecords.ProductionCode = ProductionCode;
			productionMeasurementRecords.ProductionResult = pData.PResult;
			productionMeasurementRecords.OperationStartTime = pData.StartTime.GetValueOrDefault();
			productionMeasurementRecords.OperationEndTime = pData.EndTime.GetValueOrDefault();

			measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord = productionMeasurementRecords;

			foreach (var measurementUnit in pData.Measurements)//获取到单个测量项结果
			{
			MeasurementUnitResult measurementUnitResult = new MeasurementUnitResult();
			measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
			measurementUnitResult.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
			measurementUnitResult.MeasurementName = measurementUnit.GetDisplayText();

			if (measurementUnit.MeasureType == "Alignment" \|\| measurementUnit.MeasureType == "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")
			{
			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("f2");
			measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";

			measurementUnitResults.Add(measurementUnitResult);

			foreach (var keyUnit in measurementUnit.KeyUnitCollection)//获取单个键的测量结果
			{
			foreach (var keyValue in keyUnit.MeasureValueDict)//获取单个键的单个测量item 结果
			{
			bool isExist = keyUnitDatas.Any(u => u.Key == keyUnit.Key && u.MeasurementItem == keyValue.Key);
			if (!isExist)//已存在不重复添加原始数据
			{
			KeyUnitData keyUnitData = new KeyUnitData();
			keyUnitData.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
			keyUnitData.Key = keyUnit.Key;
			keyUnitData.MeasurementItem = keyValue.Key;
			keyUnitData.ItemValue = keyValue.Value == null ? "NA" : keyValue.Value.Value.ToString("f2");
			keyUnitDatas.Add(keyUnitData);

			MeasurementAndKeyDataRelation measurementAndKeyDataRelation = new MeasurementAndKeyDataRelation();
			measurementAndKeyDataRelation.MeasurementUnitResultId = measurementUnitResult.ID;
			measurementAndKeyDataRelation.KeyUnitDataId = keyUnitData.ID;
			measurementAndKeyDataRelationList.Add(measurementAndKeyDataRelation);
			}
			}
			}
			}
			measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord = productionMeasurementRecords;
			measurementUnitResultAndKeyUnitDataSet.MeasurementAndKeyDataRelationList = measurementAndKeyDataRelationList;
			measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList = keyUnitDatas;
			measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList = measurementUnitResults;
			}
			catch (Exception ex)
			{
			LogAsync(DateTime.Now, "数据获取异常", ex.GetExceptionMessage());
			}
			return 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(() =>
			{
			lock (excelExportLock)
			{
			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;

			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"];

			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 == "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 == "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
			{
			//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];
			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);
			}
			});
			}
			}
			#endregion

			#region RowAlignment
			{
			var rowAlignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType == "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();
			};
			}
			});
			}

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

			@@ -409,7 +972,7 @@
			Directory.CreateDirectory(dir);
			}

			map.Save(Path.Combine(dir, $"{pMeasure.Barcode}_{DateTime.Now.ToString("HHmmss")}.bmp"));
			map.Save(Path.Combine(dir, $"{pMeasure.Barcode}_{pMeasure.PResult}_{DateTime.Now.ToString("HHmmss")}.png"), ImageFormat.Png);
			}
			catch (Exception ex)
			{
			@@ -457,8 +1020,16 @@
			int i = 0;
			u.KeyImages?.ForEach(image =>
			{
			string fileName = Path.Combine(dir, $"{measureName}_{u.Key}{(i == 0 ? "" : $"-{i}")}_{DateTime.Now.ToString("HHmmss")}.tiff");
			image.WriteImage("tiff", 0, fileName);
			string fileName = "";
			try
			{
			fileName = Path.Combine(dir, $"{measureName}_{u.Key}{(i == 0 ? "" : $"-{i}")}_{DateTime.Now.ToString("HHmmss")}.tiff");
			image.WriteImage("tiff", 0, fileName);
			}
			catch (Exception)
			{
			LogAsync(DateTime.Now, "切图保存失败", fileName);
			}
			i++;
			});

			@@ -468,7 +1039,7 @@
			}
			#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(() =>
			{
			@@ -476,8 +1047,11 @@
			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;
			//HObject images = imgSet.HImage;

			HObject images = new HObject();
			LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
			LogAsync(DateTime.Now, $"扫描参数:{imgSet.ImageData}", "");

			if (!string.IsNullOrWhiteSpace(toolKey))
			{
			@@ -488,6 +1062,9 @@
			keyBindCollection.ForEach(k => k.FillKeyValues(null));
			return;
			}

			//string fileName = Path.Combine(Config.ImageSaveFolder, "BeforeRun", $"{DateTime.Now.ToString("yyyyMMddHHmmssfff")}.tif");
			//imgSet.HImage.WriteImage("tiff", 0, fileName);

			_halconToolDict[toolKey].InputImageDic["INPUT_Image"] = imgSet.HImage;
			if (!_halconToolDict[toolKey].RunProcedure(out string error))
			@@ -501,6 +1078,7 @@
			}

			HOperatorSet.CountObj(images, out HTuple count);
			LogAsync(DateTime.Now, $"{snapshotName}切图{count.I}张", "");

			if (count == 0)
			{
			@@ -509,7 +1087,7 @@
			return;
			}

			var excludeKeys = keys.Where(u => u.ImageSeq > count).ToList();
			var excludeKeys = keys.Where(u => u.ImageSeq > count.I).ToList();
			if (excludeKeys.Count > 0)
			{
			LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AliasName))}未在图片获取序列中", "");
			@@ -519,9 +1097,22 @@
			});
			}

			Parallel.For(1, count.I, (i) =>
			//string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{DateTime.Now.ToString("yyyyMMdd")}", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
			//if (!Directory.Exists(dir))
			//{
			// Directory.CreateDirectory(dir);
			//}

			//Parallel.For(1, count.I + 1, (i) =>
			for (int i = 1; i <= count.I; i++)
			{
			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 =>
			{
			@@ -537,21 +1128,25 @@
			else
			{
			_halconToolDict[keyToolKey].InputImageDic["INPUT_Image"] = image;
			_halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_X"] = scanParam.Resolution_X;
			_halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z;
			_halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_X"] = scanParam.Resolution_X / 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").HTupleToDouble();
			var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").DArr.ToList();
			if (results.Count == 0 \|\| results.Any(u => u < 0))
			{
			LogAsync(DateTime.Now, $"{k.AliasName}检测结果异常", "");
			LogAsync(DateTime.Now, $"{k.AliasName}原始数据异常", "");
			}
			else
			{
			//LogAsync(DateTime.Now, $"{k.AliasName}原始数据", $"{string.Join(" ", results)}");

			results = results.Select(u => u - Config.PlanCompensation).ToList();
			resultDict = k.KeyResultList.ToDictionary(u => u, u =>
			{
			int index = k.KeyResultList.IndexOf(u);
			@@ -563,14 +1158,16 @@

			keyBindList.ForEach(kb =>
			{
			kb.KeyImages.Add(image.Clone() as HImage);
			kb.KeyImages.Add(image.ConvertHObjectToHImage());
			kb.FillKeyValues(resultDict);
			});
			});

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

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