From a383b2288dcfb90e9aa1dcf796e41d9c6be1e429 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 02 八月 2021 17:26:56 +0800
Subject: [PATCH] 1. 部分修改
---
src/Bro.M071.Process/M071Process.cs | 733 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 421 insertions(+), 312 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index f7b3f92..84bb887 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -58,25 +58,31 @@
{
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;
}
- IncomingCheckMethod = InitialMESWebServiceMethod(IncomingCheckMethodName, out IncomingCheckObj);
- DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
+ if (Config.IsEnableMESUpload)
+ {
+ IncomingCheckMethod = InitialMESWebServiceMethod(IncomingCheckMethodName, out IncomingCheckObj);
+ DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
+ }
var allowedShiftStr = ConfigurationManager.AppSettings["DataShift"];
if (!double.TryParse(allowedShiftStr, out _allowedShift))
@@ -195,6 +201,37 @@
}
#endregion
+
+ 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>();
@@ -237,7 +274,7 @@
_isdoing = true;
}
- MachineState = MachineState.Running;
+ MeasureState = MachineState = MachineState.Running;
OnCheckHintUpload?.Invoke(hint, true);
OnMeasureStart?.Invoke();
@@ -394,7 +431,6 @@
private void StartCheck()
{
-
if (isRightStart && isLeftStart)
{
if (_isdoing)
@@ -494,6 +530,48 @@
}
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
@@ -618,6 +696,7 @@
//if (MachineState == MachineState.Running)
// MachineState = MachineState.Ready;
+ MeasureState = MachineState.Ready;
if (MachineState != MachineState.Alarm)
{
if (MachineState == MachineState.Pause)
@@ -629,6 +708,8 @@
MachineState = MachineState.Ready;
}
}
+
+ _jobDoneHandle.Set();
var measurementUnitResultAndKeyUnitDataSet = GetMeasurementUnitResultAndKeyUnitData(pMeasure);
@@ -821,6 +902,7 @@
//}
static object excelExportLock = new object();
+ string fileName = "";
private async void ExportProductionInColumns(ProductionMeasurementUnitResultAndKeyUnitDataSet exportData)
{
if (!Config.IsCSVOutputEnabled)
@@ -834,305 +916,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.StartsWith("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.StartsWith("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
- {
- int rowDataStartCol = rawDataSheet.Dimension.Columns;
- var barcodeCell = rawDataSheet.Cells[1, rowDataStartCol + 1, 1, rowDataStartCol + 4];
- barcodeCell.Merge = true;
- barcodeCell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
- barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
- SetTitleCell(barcodeCell);
-
- var z1Cell = rawDataSheet.Cells[2, rowDataStartCol + 1];
- z1Cell.Value = "Z1";
- SetTitleCell(z1Cell);
-
- var z2Cell = rawDataSheet.Cells[2, rowDataStartCol + 2];
- z2Cell.Value = "Z2";
- SetTitleCell(z2Cell);
-
- var z3Cell = rawDataSheet.Cells[2, rowDataStartCol + 3];
- z3Cell.Value = "Z3";
- SetTitleCell(z3Cell);
-
- var z4Cell = rawDataSheet.Cells[2, rowDataStartCol + 4];
- z4Cell.Value = "Z4";
- SetTitleCell(z4Cell);
-
- exportData.KeyUnitDataList.ForEach(k =>
- {
- int keyIndex = Config.KeyNameCollection.IndexOf(k.Key);
- if (keyIndex < 0)
- {
- LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{k.Key}鐨凴awData鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
- return;
- }
-
- int zIndex = int.Parse(k.MeasurementItem.Substring(1));
-
- var cell = rawDataSheet.Cells[keyIndex + 1 + 2, rowDataStartCol + zIndex];
- cell.Value = string.IsNullOrWhiteSpace(k.ItemValue) ? "NA" : k.ItemValue;
- });
- }
- #endregion
-
- #region Slant
- var slantMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("Slant")).ToList();
- if (slantMeasures.Count > 0)
- {
- int slantStartCol = slantSheet.Dimension.Columns;
-
- var barcodeCell = slantSheet.Cells[1, slantStartCol + 1];
- barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
- SetTitleCell(barcodeCell);
-
- var valueCell = slantSheet.Cells[2, slantStartCol + 1];
- valueCell.Value = "Value";
- SetTitleCell(valueCell);
-
- slantMeasures.ForEach(m =>
- {
- int rowIndex = Config.KeyNameCollection.IndexOf(m.Keys);
- if (rowIndex < 0)
- {
- LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{m.Keys}鐨凷lant鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
- return;
- }
-
- var cellValue = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 1];
- //var cellResult = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 2];
-
- cellValue.Value = m.MeasurementValue;
- //cellResult.Value = m.MeasurementResult;
-
- if (m.MeasurementResult != "OK")
- {
- SetNGCell(cellValue);
- //SetNGCell(cellResult);
- }
- });
- }
- #endregion
-
- #region Alignment
- {
- var alignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("Alignment")).ToList();
- if (alignmentMeasures.Count > 0)
- {
- List<string> keysList = new List<string>();
- int allRowNums = alignmentSheet.Dimension.Rows;
- int aligneStartCol = alignmentSheet.Dimension.Columns;
-
- for (int i = 3; i <= alignmentSheet.Dimension.End.Row; i++)
- {
- string keys = alignmentSheet.Cells[i, 1].Value.ToString();
- string position = alignmentSheet.Cells[i, 2].Value.ToString();
-
- keysList.Add($"{keys}_{position}");
- }
-
- //var barcodeCell = alignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
- //barcodeCell.Merge = true;
- //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
- //SetTitleCell(barcodeCell);
-
- var barcodeCell = alignmentSheet.Cells[1, aligneStartCol + 1];
+ 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}鐨凙lignment鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
+ LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{k.Key}鐨凴awData鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
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}鐨凷lant鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
+ return;
+ }
+
+ var cellValue = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 1];
+ //var cellResult = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 2];
+
+ cellValue.Value = m.MeasurementValue;
+ //cellResult.Value = m.MeasurementResult;
+
+ if (m.MeasurementResult != "OK")
{
SetNGCell(cellValue);
//SetNGCell(cellResult);
}
});
}
- }
- #endregion
+ #endregion
- #region RowAlignment
- {
- var rowAlignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("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}鐨凙lignment鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
+ return;
+ }
+
+ var cellValue = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 1];
+ //var cellResult = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];
+
+ cellValue.Value = a.MeasurementValue;
+ //cellResult.Value = a.MeasurementResult;
+
+ if (a.MeasurementResult != "OK")
+ {
+ SetNGCell(cellValue);
+ //SetNGCell(cellResult);
+ }
+ });
}
-
- //var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
- //barcodeCell.Merge = true;
- //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
- //SetTitleCell(barcodeCell);
-
- var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1];
- barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
- SetTitleCell(barcodeCell);
-
- var valueCell = rowAlignmentSheet.Cells[2, aligneStartCol + 1];
- valueCell.Value = "Value";
- SetTitleCell(valueCell);
-
- //var resultCell = rowAlignmentSheet.Cells[2, aligneStartCol + 2];
- //resultCell.Value = "Result";
- //SetTitleCell(resultCell);
-
- rowAlignmentMeasures.ForEach(a =>
- {
- int rowIndex = keysList.IndexOf($"{a.Keys}_{a.Positions}");
- if (rowIndex < 0)
- {
- LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{a.Keys}_{a.Positions}鐨凴owAlignment鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
- return;
- }
-
- var cellValue = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 1];
- //var cellResult = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];
-
- cellValue.Value = a.MeasurementValue;
- //cellResult.Value = a.MeasurementResult;
-
- if (a.MeasurementResult != "OK")
- {
- SetNGCell(cellValue);
- //SetNGCell(cellResult);
- }
- });
}
- }
- #endregion
+ #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;
- rawDataSheet.Dispose();
- slantSheet.Dispose();
- alignmentSheet.Dispose();
- rowAlignmentSheet.Dispose();
- };
+ for (int i = 3; i <= allRowNums; i++)
+ {
+ string keys = alignmentSheet.Cells[i, 1].Value.ToString();
+ string position = alignmentSheet.Cells[i, 2].Value.ToString();
+
+ keysList.Add($"{keys}_{position}");
+ }
+
+ //var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
+ //barcodeCell.Merge = true;
+ //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
+ //SetTitleCell(barcodeCell);
+
+ var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1];
+ barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
+ SetTitleCell(barcodeCell);
+
+ var valueCell = rowAlignmentSheet.Cells[2, aligneStartCol + 1];
+ valueCell.Value = "Value";
+ SetTitleCell(valueCell);
+
+ //var resultCell = rowAlignmentSheet.Cells[2, aligneStartCol + 2];
+ //resultCell.Value = "Result";
+ //SetTitleCell(resultCell);
+
+ rowAlignmentMeasures.ForEach(a =>
+ {
+ int rowIndex = keysList.IndexOf($"{a.Keys}_{a.Positions}");
+ if (rowIndex < 0)
+ {
+ LogAsync(DateTime.Now, "Excel瀵煎嚭閿欒", $"{a.Keys}_{a.Positions}鐨凴owAlignment鏈兘鑾峰彇琛屼俊鎭紝鏈鍑�");
+ return;
+ }
+
+ var cellValue = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 1];
+ //var cellResult = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];
+
+ cellValue.Value = a.MeasurementValue;
+ //cellResult.Value = a.MeasurementResult;
+
+ if (a.MeasurementResult != "OK")
+ {
+ SetNGCell(cellValue);
+ //SetNGCell(cellResult);
+ }
+ });
+ }
+ }
+ #endregion
+
+ package.Save();
+
+ rawDataSheet.Dispose();
+ slantSheet.Dispose();
+ alignmentSheet.Dispose();
+ rowAlignmentSheet.Dispose();
+ };
+ }
+ 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);
+ }
}
});
}
@@ -1253,6 +1350,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(() =>
@@ -1330,71 +1429,81 @@
// 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}鍘熷鏁版嵁寮傚父", "");
+ }
+ else
+ {
+ //LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁", $"{string.Join(" ", results)}");
+
+ results = results.Select(u => u - Config.PlanCompensation).ToList();
+ resultDict = k.KeyResultList.ToDictionary(u => u, u =>
+ {
+ int index = k.KeyResultList.IndexOf(u);
+ return results[index];
+ });
+ }
}
}
- }
- keyBindList.ForEach(kb =>
- {
- kb.KeyImages.Add(image.ConvertHObjectToHImage());
- kb.FillKeyValues(resultDict);
+ keyBindList.ForEach(kb =>
+ {
+ if (kb.KeyImages != null)
+ {
+ kb.KeyImages.Add(image.ConvertHObjectToHImage());
+ kb.FillKeyValues(resultDict);
+ }
+ else
+ {
+
+ }
+ });
});
- });
- image.Dispose();
- image = null;
+ image.Dispose();
+ image = null;
+ }
+ //);
}
- //);
imgSet.HImage.Dispose();
imgSet.HImage = null;
--
Gitblit v1.8.0