From 78289c64a16dd02cc9fec595bf758a9e30a30926 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期六, 20 二月 2021 10:51:11 +0800
Subject: [PATCH] gocator修改异步模式下图片获取操作
---
src/Bro.M071.Process/M071Process.cs | 477 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 342 insertions(+), 135 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 155f253..f7b3f92 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/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,10 +48,11 @@
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()
{
@@ -70,6 +73,15 @@
if (Config.Precision > 0)
{
_precision = "f" + Config.Precision;
+ }
+
+ IncomingCheckMethod = InitialMESWebServiceMethod(IncomingCheckMethodName, out IncomingCheckObj);
+ DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
+
+ var allowedShiftStr = ConfigurationManager.AppSettings["DataShift"];
+ if (!double.TryParse(allowedShiftStr, out _allowedShift))
+ {
+ _allowedShift = 0;
}
}
@@ -183,9 +195,11 @@
}
#endregion
- public string BarCode { get; set; }
-
+ 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 +209,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);
+ }
+
+ lock (_doingLock)
+ {
+ if (_isdoing)
+ {
+ LogAsync(DateTime.Now, "璁惧姝ｅ湪杩愯涓�", "");
+ return new ProcessResponse(true);
+ }
+
+ _isdoing = true;
}
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 +263,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 +332,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,15 +378,30 @@
get => isRightStart;
set
{
- isRightStart = value;
- StartCheck();
+ if (isRightStart != value)
+ {
+ lock (_rightStartLock)
+ {
+ if (isRightStart != value)
+ {
+ isRightStart = value;
+ StartCheck();
+ }
+ }
+ }
}
}
private void StartCheck()
{
+
if (isRightStart && isLeftStart)
{
+ if (_isdoing)
+ {
+ OnCheckHintUpload?.Invoke("璁惧杩愯涓�", false);
+ return;
+ }
StartJob(null, null, null);
}
}
@@ -341,6 +427,74 @@
return new ProcessResponse();
}
+
+ [ProcessMethod("Demostration", "CheckBasePlan", "鍩哄噯骞抽潰妫�鏍�", InvokeType.TestInvoke)]
+ public ProcessResponse CheckBasePlan(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
+ {
+ if (opConfig is DemostrationOperationConfig config)
+ {
+ config.DemoOperations.ForEach(d =>
+ {
+ IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == d.MotionOp.Device);
+ if (device != null)
+ {
+ IMotionCard motionDevice = device as IMotionCard;
+
+ if (motionDevice != null)
+ {
+ var response = motionDevice.Run(d.MotionOp.OpConfig);
+ if (!response.Result)
+ {
+ throw new ProcessException($"{device.Name}寮傚父锛寋response.Message}", null, ExceptionLevel.Fatal);
+ }
+ }
+ }
+
+ CameraBase camera = DeviceCollection.FirstOrDefault(u => u.Id == d.CameraOp.Device) as CameraBase;
+ if (camera != null)
+ {
+ IImageSet set = null;
+ try
+ {
+ set = CollectHImage(camera, d.CameraOp.OpConfig);
+ }
+ catch (ProcessException pEx)
+ {
+ pEx.Level = ExceptionLevel.Fatal;
+ throw pEx;
+ }
+
+ if (set != null)
+ {
+ LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(set.ImageData);
+ LogAsync(DateTime.Now, $"鎵弿鍙傛暟:{set.ImageData}", "");
+
+ var tool = GetHalconTool(d.CameraOp.OpConfig, config.MonitorSetId);
+ if (tool != null)
+ {
+ using (tool.InputImageDic["INPUT_Image"] = set.HImage)
+ {
+ tool.InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z / 1000000.0;
+
+ if (!tool.RunProcedure(out string error))
+ {
+ LogAsync(DateTime.Now, $"{tool.ProcedureName}鎵ц寮傚父", error);
+ }
+ else
+ {
+ var diffX = tool.GetResultTuple("OUTPUT_Result_X").D;
+ var diffY = tool.GetResultTuple("OUTPUT_Result_Y").D;
+ LogAsync(DateTime.Now, $"妫�娴嬪钩闈紝X鏂瑰悜鏋佸樊锛歿diffX.ToString(_precision)}锛孻鏂瑰悜鏋佸樊锛歿diffY.ToString(_precision)}", "");
+ }
+ }
+ }
+ }
+ }
+ });
+ }
+
+ return new ProcessResponse();
+ }
#endregion
#region 绉佹湁鏂规硶
@@ -348,9 +502,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 +521,8 @@
{
if (m.KeyUnitCollection.Any(k => k.IsDone == false))
{
- m.Spec.ActualValue = -999;
+ //m.Spec.ActualValue = -999;
+ m.Spec.ActualValue = null;
}
else
{
@@ -371,7 +530,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,7 +541,8 @@
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
{
@@ -390,21 +551,26 @@
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;
+
+ //M071瑕佹眰瓒呴檺鏁版嵁鍦ㄥ厑璁歌寖鍥村唴鍘嬬缉鍒板悎鏍艰寖鍥村唴
+ if (_allowedShift > 0 && m.Spec.MeasureResult != null && m.Spec.MeasureResult.Value == false)
+ {
+ m.Spec.ActualValue = m.Spec.StandardValue + (actualValue - m.Spec.StandardValue) * (m.Spec.Tolrenance_Positive - m.Spec.StandardValue) / (m.Spec.Tolrenance_Positive - m.Spec.StandardValue + _allowedShift);
+ }
}
}
}
}
- //LogAsync(DateTime.Now, $"{m.GetDisplayText()}妫�娴嬬粨鏋�", $"{((m.Spec.MeasureResult ?? false) ? "OK" : "NG")}");
-
KeyIndicator indicator = new KeyIndicator(m.Id, m.DisplayLocation);
- indicator.Text = (m.Spec.ActualValue == null || m.Spec.ActualValue == -999) ? "NA" : m.Spec.ActualValue.Value.ToString(_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 +590,52 @@
}
pMeasure.EndTime = DateTime.Now;
- bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
- pMeasure.PResult = pResult ? "OK" : "NG";
- OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
+ //bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
+ //pMeasure.PResult = pResult ? "OK" : "NG";
+ //OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
+ //OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);
+
+ int result = -1;
+ if (pMeasure.Measurements.Any(u => u.Spec.MeasureResult == null))
+ {
+ pMeasure.PResult = "NA";
+ }
+ else if (pMeasure.Measurements.Any(u => u.Spec.MeasureResult == false))
+ {
+ pMeasure.PResult = "NG";
+ result = 0;
+ }
+ else
+ {
+ pMeasure.PResult = "OK";
+ result = 1;
+ }
+ OnUpdateResult?.Invoke(DateTime.Now, result);
OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);
LogAsync(DateTime.Now, $"{pMeasure.Barcode} 妫�娴嬪畬鎴愶紝缁撴灉 {pMeasure.PResult}", "");
- if (MachineState == MachineState.Running)
- MachineState = MachineState.Ready;
+ //if (MachineState == MachineState.Running)
+ // MachineState = MachineState.Ready;
+
+ if (MachineState != MachineState.Alarm)
+ {
+ if (MachineState == MachineState.Pause)
+ {
+ _machineStateBeforePause = MachineState.Ready;
+ }
+ else
+ {
+ MachineState = MachineState.Ready;
+ }
+ }
var measurementUnitResultAndKeyUnitDataSet = GetMeasurementUnitResultAndKeyUnitData(pMeasure);
- //MES杈撳嚭 todo
- if (Config.IsEnableMESUpload)
+ if (pMeasure.PResult != "NA")
{
+ //MES杈撳嚭
+ MESCheckDataUpload(pMeasure);
}
//Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
@@ -450,49 +647,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 +726,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,49 +776,49 @@
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();
private async void ExportProductionInColumns(ProductionMeasurementUnitResultAndKeyUnitDataSet exportData)
@@ -686,7 +887,7 @@
positionCell.Value = "Positions";
SetTitleCell(positionCell);
- var alignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType == "Alignment").ToList();
+ 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];
@@ -713,7 +914,7 @@
positionCell.Value = "Positions";
SetTitleCell(positionCell);
- var rowAlignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType == "RowAlignment").ToList();
+ 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];
@@ -729,8 +930,6 @@
#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;
@@ -772,15 +971,10 @@
#endregion
#region Slant
- var slantMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType == "Slant").ToList();
+ 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, 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;
@@ -789,10 +983,6 @@
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 =>
{
@@ -820,7 +1010,7 @@
#region Alignment
{
- var alignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType == "Alignment").ToList();
+ var alignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("Alignment")).ToList();
if (alignmentMeasures.Count > 0)
{
List<string> keysList = new List<string>();
@@ -879,7 +1069,7 @@
#region RowAlignment
{
- var rowAlignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType == "RowAlignment").ToList();
+ var rowAlignmentMeasures = exportData.MeasurementUnitResultList.Where(u => u.MeasurementType.StartsWith("RowAlignment")).ToList();
if (rowAlignmentMeasures.Count > 0)
{
List<string> keysList = new List<string>();
@@ -937,6 +1127,11 @@
#endregion
package.Save();
+
+ rawDataSheet.Dispose();
+ slantSheet.Dispose();
+ alignmentSheet.Dispose();
+ rowAlignmentSheet.Dispose();
};
}
});
@@ -1065,8 +1260,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);
@@ -1191,11 +1392,17 @@
});
image.Dispose();
+ image = null;
}
//);
imgSet.HImage.Dispose();
+ imgSet.HImage = null;
+ imgSet.Dispose();
+
images.Dispose();
+ images = null;
+
//if (count.I != 1)
//{
// hImage?.Dispose();
--
Gitblit v1.8.0