From 9402b8187cd3f880e87bad0035b774362ab9636b Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 10 七月 2020 15:17:59 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Process.cs | 219 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 191 insertions(+), 28 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index c026e29..01065c8 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -2,9 +2,12 @@
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.Process;
using HalconDotNet;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -47,6 +50,11 @@
base.Open();
+ SwitchBeep(false);
+ SwitchLightGreen(false);
+ SwitchLightRed(false);
+ SwitchLightYellow(false);
+
Reset(null, null, null);
FullReset(null);
}
@@ -73,21 +81,21 @@
var snapshotPoint = Config.SnapshotPointCollection.FirstOrDefault(s => s.Id == u.SnapshotPointId && s.IsEnabled);
if (snapshotPoint == null)
- throw new ProcessException($"{u.AlignName}鏈缃彲鐢ㄦ媿鐓х偣浣�");
+ throw new ProcessException($"{u.AliasName}鏈缃彲鐢ㄦ媿鐓х偣浣�");
if (u.ImageSeq < 1)
- throw new ProcessException($"{u.AlignName}鍥剧墖搴忓彿灏忎簬1");
+ throw new ProcessException($"{u.AliasName}鍥剧墖搴忓彿灏忎簬1");
var algo = Config.KeyAlgorithemCollection.FirstOrDefault(a => a.Id == u.KeyAlgorithemId);
if (algo == null)
- throw new ProcessException($"{u.AlignName}鏈缃娴嬬畻娉�");
+ throw new ProcessException($"{u.AliasName}鏈缃娴嬬畻娉�");
u.KeyAlgorithemPath = algo.AlgorithemPath;
- LoadHalconTool(u.KeyAlgorithemPath, u.AlignName);
+ LoadHalconTool(u.KeyAlgorithemPath, u.AliasName);
var resultSet = Config.KeyResultCollection.FirstOrDefault(r => r.Id == u.KeyResultId);
if (resultSet == null)
- throw new ProcessException($"{u.AlignName}鏈缃娴嬬粨鏋滈厤缃�");
+ throw new ProcessException($"{u.AliasName}鏈缃娴嬬粨鏋滈厤缃�");
u.KeyResultList = new List<string>(resultSet.Results);
});
@@ -214,11 +222,10 @@
if (camera == null)
return;
- string imgSetId = "";
- HImage hImage = null;
+ IImageSet set = null;
try
{
- hImage = CollectHImage(camera, s.CameraOp.OpConfig, out imgSetId);
+ set = CollectHImage(camera, s.CameraOp.OpConfig);
}
catch (ProcessException pEx)
{
@@ -226,12 +233,12 @@
throw pEx;
}
- if (string.IsNullOrWhiteSpace(imgSetId))
+ if (set == null)
{
return;
}
- RunImageHandle(camera, s.CameraOp.OpConfig, hImage, s.Id, s.Name, pMeasure.Measurements);
+ RunImageHandle(camera, s.CameraOp.OpConfig, set, s.Id, s.Name, pMeasure.Measurements);
});
BarCode = "";
@@ -341,7 +348,7 @@
IShapeElement indicator = null;
pMeasure.ElementList.Add(indicator);
- //杈撳嚭鍥惧舰鍩哄厓鍒扮晫闈� todo
+ //杈撳嚭鍥惧舰鍩哄厓鍒扮晫闈�
OnElementUpdated?.BeginInvoke(indicator, null, null);
SaveKeyImages(pMeasure.Barcode, m);
@@ -359,25 +366,178 @@
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 MeasurementUnitResult in pData.Measurements)//鑾峰彇鍒板崟涓祴閲忛」缁撴灉
+ {
+ MeasurementUnitResult measurementUnitResult = new MeasurementUnitResult();
+ measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
+ measurementUnitResult.MeasurementName = MeasurementUnitResult.Name;
+ measurementUnitResult.MeasurementType = MeasurementUnitResult.MeasureType;
+ measurementUnitResult.MeasurementValue = MeasurementUnitResult.Spec.ActualValue.ToString();
+ measurementUnitResult.MeasurementResult = MeasurementUnitResult.Spec.MeasureResult.Value ? "OK" : "NG";
+
+ measurementUnitResults.Add(measurementUnitResult);
+
+ foreach (var keyUnit in MeasurementUnitResult.KeyUnitCollection)//鑾峰彇鍗曚釜閿殑娴嬮噺缁撴灉
+ {
+ foreach (var keyValue in keyUnit.MeasureValueDict)//鑾峰彇鍗曚釜閿殑鍗曚釜娴嬮噺item 缁撴灉
+ {
+ bool isExist = keyUnitDatas.FirstOrDefault(u => u.Key == keyUnit.Key && u.MeasurementItem == keyValue.Key) != null;
+ if (!isExist)//宸插瓨鍦� 涓嶉噸澶嶆坊鍔犲師濮嬫暟鎹�
+ {
+ KeyUnitData keyUnitData = new KeyUnitData();
+ 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)
+ {
+ await Task.Run(() =>
+ {
+ ExcelExportSet excelExportDto = new ExcelExportSet();
+ excelExportDto.Worksheets = new List<string>() { "鍘熷鏁版嵁", "妫�娴嬬粨鏋�" };
+ var keyUnitColumns = new Dictionary<string, string>()
+ {
+ {"Key", "閿�"},
+ {"MeasurementItem", "妫�娴嬮」"},
+ {"ItemValue", "妫�娴嬪��"}
+ };
+ var measurementUnitResultColumns = new Dictionary<string, string>()
+ {
+ {"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); ;
+
+ byte[] filecontent = ExcelExportHelper.ExportExcel(excelExportDto, false);
+ string dir = Path.Combine(Config.LogPath, DateTime.Now.ToString("yyyyMMdd"));
+ if (!Directory.Exists(dir))
+ {
+ Directory.CreateDirectory(dir);
+ }
+
+ FileStream fs = new FileStream(Path.Combine(dir, $"{measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord.ProductionBarcode}_{DateTime.Now.ToString("HHmmss")}.xlsx"), FileMode.Create, FileAccess.Write);
+ fs.Write(filecontent, 0, filecontent.Length);
+ fs.Flush();
+ fs.Close();
+ });
}
#region 鍥惧儚淇濆瓨
@@ -463,7 +623,7 @@
}
#endregion
- private async void RunImageHandle(CameraBase camera, IOperationConfig opConfig, HImage hImage, string snapshotId, string snapshotName, List<MeasurementUnit> measureList)
+ private async void RunImageHandle(CameraBase camera, IOperationConfig opConfig, IImageSet imgSet, string snapshotId, string snapshotName, List<MeasurementUnit> measureList)
{
await Task.Run(() =>
{
@@ -471,7 +631,8 @@
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 = hImage;
+ HObject images = imgSet.HImage;
+ LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
if (!string.IsNullOrWhiteSpace(toolKey))
{
@@ -483,7 +644,7 @@
return;
}
- _halconToolDict[toolKey].InputImageDic["INPUT_Image"] = hImage;
+ _halconToolDict[toolKey].InputImageDic["INPUT_Image"] = imgSet.HImage;
if (!_halconToolDict[toolKey].RunProcedure(out string error))
{
LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶寮傚父锛寋error}", "");
@@ -506,7 +667,7 @@
var excludeKeys = keys.Where(u => u.ImageSeq > count).ToList();
if (excludeKeys.Count > 0)
{
- LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AlignName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
+ LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AliasName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
keyBindCollection.Where(k => excludeKeys.Any(u => u.Key == k.Key)).ToList().ForEach(k =>
{
k.FillKeyValues(null);
@@ -523,24 +684,26 @@
var keyBindList = keyBindCollection.Where(u => u.Key == k.Key).ToList();
- string keyToolKey = k.AlignName + "|" + k.KeyAlgorithemPath;
+ string keyToolKey = k.AliasName + "|" + k.KeyAlgorithemPath;
if (!_halconToolDict.ContainsKey(keyToolKey))
{
- LogAsync(DateTime.Now, $"{k.AlignName}妫�娴嬬畻娉曟湭鍒濆鍖�", "");
+ LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曟湭鍒濆鍖�", "");
}
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;
if (!_halconToolDict[keyToolKey].RunProcedure(out string error))
{
- LogAsync(DateTime.Now, $"{k.AlignName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
+ LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
}
else
{
var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").HTupleToDouble();
if (results.Count == 0 || results.Any(u => u < 0))
{
- LogAsync(DateTime.Now, $"{k.AlignName}妫�娴嬬粨鏋滃紓甯�", "");
+ LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬粨鏋滃紓甯�", "");
}
else
{
@@ -563,11 +726,11 @@
image.Dispose();
});
- if (count.I != 1)
- {
- hImage?.Dispose();
- hImage = null;
- }
+ //if (count.I != 1)
+ //{
+ // hImage?.Dispose();
+ // hImage = null;
+ //}
});
}
#endregion
--
Gitblit v1.8.0