From 12200ec69e33881649974f31f270750ba6b15e1d Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Process.cs | 268 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 245 insertions(+), 23 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 0b2ad8b..144827a 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -2,7 +2,10 @@
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;
@@ -10,6 +13,7 @@
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 +52,8 @@
base.Open();
+ InitialMotionCardBaseAxisAlarm();
+
SwitchBeep(false);
SwitchLightGreen(false);
SwitchLightRed(false);
@@ -57,9 +63,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 +180,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 +195,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 +225,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)
@@ -304,10 +338,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))
{
@@ -344,10 +382,12 @@
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,25 +404,185 @@
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
-
- //鏁版嵁搴撲繚瀛� todo
+ //Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
+ ExportProductionExcel(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();
+ measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
+ measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue.ToString();
+ 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.ToString();
+ 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();
+ });
}
#region 鍥惧儚淇濆瓨
@@ -409,7 +609,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 +657,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++;
});
@@ -478,6 +686,7 @@
string toolKey = (opConfig as CameraOprerationConfigBase).AlgorithemPath;
HObject images = imgSet.HImage;
LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
+ LogAsync(DateTime.Now, $"鎵弿鍙傛暟:{imgSet.ImageData}", "");
if (!string.IsNullOrWhiteSpace(toolKey))
{
@@ -501,6 +710,7 @@
}
HOperatorSet.CountObj(images, out HTuple count);
+ LogAsync(DateTime.Now, $"{snapshotName}鍒囧浘{count.I}寮�", "");
if (count == 0)
{
@@ -509,7 +719,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 +729,19 @@
});
}
- 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");
+ image.ConvertHObjectToHImage().WriteImage("tiff", 0, fileName);
keys.Where(u => u.ImageSeq == i).ToList().ForEach(k =>
{
@@ -537,8 +757,8 @@
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;
if (!_halconToolDict[keyToolKey].RunProcedure(out string error))
{
LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
@@ -548,10 +768,11 @@
var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").HTupleToDouble();
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)}");
resultDict = k.KeyResultList.ToDictionary(u => u, u =>
{
int index = k.KeyResultList.IndexOf(u);
@@ -563,13 +784,14 @@
keyBindList.ForEach(kb =>
{
- kb.KeyImages.Add(image.Clone() as HImage);
+ kb.KeyImages.Add(image.ConvertHObjectToHImage());
kb.FillKeyValues(resultDict);
});
});
- image.Dispose();
- });
+ //image.Dispose();
+ }
+ //);
//if (count.I != 1)
//{
--
Gitblit v1.8.0