From ab3d347fc586c682c154924ec9959cac3fb89754 Mon Sep 17 00:00:00 2001
From: Gokiburi <Gokiburi@DESKTOP-9ITC11L>
Date: 星期六, 21 六月 2025 15:13:10 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M200
---
src/Bro.M141.Process/M141Process_ImageCheck.cs | 133 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 127 insertions(+), 6 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process_ImageCheck.cs b/src/Bro.M141.Process/M141Process_ImageCheck.cs
index e76e5cf..b61d5c4 100644
--- a/src/Bro.M141.Process/M141Process_ImageCheck.cs
+++ b/src/Bro.M141.Process/M141Process_ImageCheck.cs
@@ -3,10 +3,14 @@
using Bro.Common.Interface;
using Bro.Common.Model;
using Bro.M135.Common;
+using Bro.M135.DBManager;
using HalconDotNet;
using Microsoft.VisualBasic;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using NPOI.SS.UserModel;
+using NPOI.Util;
+using NPOI.XSSF.UserModel;
using Sunny.UI;
using System.Data;
using System.Data.SqlTypes;
@@ -28,6 +32,9 @@
Dictionary<string, List<double>> dicdate = new Dictionary<string, List<double>>();
ManualResetEvent set1 = new ManualResetEvent(false);
ManualResetEvent set2 = new ManualResetEvent(false);
+
+
+ public event Action<string> StartPrinter;
[ProcessMethod("ImageCheck", "ImageCheckOperation", "閫氱敤鍥剧墖妫�娴嬫搷浣�", InvokeType.TestInvoke)]
public ResponseMessage ImageCheckOperation(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
@@ -434,6 +441,8 @@
return msg;
}
+
+
[ProcessMethod("", "ProductDataUpload", "浜у搧鏁版嵁姹囨��", InvokeType.TestInvoke)]
@@ -498,6 +507,105 @@
}
+ private bool _isDemoStarted = false;
+ [ProcessMethod("OfflineDemo", "OfflineDemo", "绂荤嚎娴嬭瘯", InvokeType.CalibInvoke)]
+ public ResponseMessage OfflineDemo(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
+ {
+ if (config is OfflineDemoOperationConfig opConfig)
+ {
+ if (_isDemoStarted)
+ {
+ _isDemoStarted = false;
+ }
+ else
+ {
+ _isDemoStarted = true;
+ OfflineDemoAsync(opConfig.ImageFolder, opConfig.IsOK, opConfig.SaveImageTime);
+ }
+ }
+
+ return new ResponseMessage();
+ }
+
+ private async void OfflineDemoAsync(string imageFolder,bool isok,int saveimagetime)
+ {
+ await Task.Run(() =>
+ {
+ var imageFileNames = new DirectoryInfo(imageFolder).GetFiles().Select(u => u.FullName).ToList();
+
+ for (int i = 0; i < imageFileNames.Count; i++)
+ {
+ if (!_isDemoStarted)
+ {
+ return;
+ }
+ var imageFile = Path.GetFileNameWithoutExtension(imageFileNames[i]);
+ if (imageFile.EndsWith("Fit"))
+ {
+ continue;
+ }
+ if (imageFile.EndsWith("OK")& isok == false)
+ {
+ continue;
+ }
+ if (imageFile.EndsWith("NG") & isok == true)
+ {
+ continue;
+ }
+ var nameDatas = imageFile.Split(new char[] { '_'}, StringSplitOptions.RemoveEmptyEntries).ToList();
+ if (nameDatas.Count != 5)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Error, $"鏂囦欢{imageFile}鍛藉悕涓嶇鍚堣鑼冿紝涓嶆墽琛岀绾挎祴璇�");
+ continue;
+ }
+
+ var sn = nameDatas[0];
+ var imageSeq = nameDatas[2][^1].ToString();
+ var measureBind = M141Config.MeasureBindCollection.FirstOrDefault(u => u.ImageSaveSeq == imageSeq);
+
+ if (measureBind == null || !measureBind.IsFixed)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"绂荤嚎娴嬭瘯锛屽伐浣峽(measureBind == null ? "鏈尮閰�" : $"{measureBind.WorkPosition}鏈紑鍚�")}");
+ continue;
+ }
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"绂荤嚎娴嬭瘯锛屼骇鍝亄sn}寮�濮嬪伐浣峽measureBind.WorkPosition}绂荤嚎妫�娴�");
+ MLImageSet imgSet = new MLImageSet();
+
+ imgSet.HImage = new HalconDotNet.HImage(imageFileNames[i]);
+ imgSet.PID = sn;
+
+ var detectResults = ML.RunMLDetectionSync(imgSet, null, measureBind.DetectionId);
+ Thread.Sleep(saveimagetime);
+ imgSet.HImage?.Dispose();
+ imgSet.HImage = null;
+
+ }
+ });
+ }
+
+
+
+ [ProcessMethod("printer", "printer", "鎵撳嵃鏈烘墦鍗�", InvokeType.TestInvoke)]
+ public ResponseMessage Printer(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
+ {
+ ResponseMessage msg = new ResponseMessage();
+
+ Plc2 = invokeDevice as PLCBase;
+ string message = "";
+ StartPrinter.Invoke(message);
+ return msg;
+ }
+
+
+ public void PlcwritePrinter(int add, int value)
+ {
+ Plc2.WriteSingleAddress(add, value, out _);
+ }
+
+
+
+
protected List<ISpec> GetSpecListFromConfigSelection(List<SpecSelector> specSelectors)
@@ -508,9 +616,10 @@
var spec = M141Config.SpecCollection.FirstOrDefault(s => s.Code == u.SpecCode);
if (spec != null)
{
- var temp = spec.Copy<Spec>();
+ var temp = spec.Copy();
temp.ActualValue = null;
temp.MeasureResult = null;
+ temp.Source = "";
specList.Add(temp);
}
});
@@ -532,6 +641,9 @@
});
return specList;
}
+
+
+
protected void FillSpecResults(string pid, List<ISpec> detectSpec, List<double> results, string SEQUENCE)
{
@@ -556,8 +668,6 @@
}
}
-
-
LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{pid}妫�娴嬮」{s.Code}璧嬪�納s.GetMeasureValueStr()}锛岀粨鏋渰s.GetMeasureResultStr()}");
}
else
@@ -580,12 +690,21 @@
{
isOK = false;
+ int num = 0;
+
+ while (p.Details.Any(u => !u.IsDone) && num < 10)
+ {
+ num++;
+ Thread.Sleep(500);
+ }
+
+
p.InitialDetailSpecs();
var resultList = p.Details.SelectMany(u => u.ResultList).ToList();
resultList.ForEach(u => u.SetResult());
var defects = resultList.GetDefectDescList();
- var ngSpecCodes = p.Details.SelectMany(u => u.SpecList ?? new List<Spec>()).Where(u => u.MeasureResult != true).Select(u => u.Code);
+ var ngSpecCodes = p.Details.SelectMany(u => u.SpecList ?? new List<ISpec>()).Where(u => u.MeasureResult != true).Select(u => u.Code);
var ngDefectDescList = p.Details.SelectMany(u => u.DefectList ?? new List<string>()).ToList();
defects.AddRange(ngSpecCodes);
@@ -595,16 +714,18 @@
{
defects.Add("TBD");
}
+
+
defects = defects.Distinct().ToList();
isOK = defects.Count <= 0;
UpdateDefectAsync(defects);
var defectClass = GetDefectClassFromDefectList(defects);
- UpdateResult(DateTime.Now, p.SN, defectClass.ClassName, "");
+ UpdateResult(DateTime.Now, p.SN, defectClass.ClassName, "",p.ImagePaths);
//浜у搧搴忓彿+1
- Interlocked.Increment(ref _productIndex);
+ //Interlocked.Increment(ref _productIndex);
List<ISpec> specList = new List<ISpec>();
specList.AddRange(p.Details.SelectMany(u => u.SpecList).ToList().ConvertAll(u => (ISpec)u));
--
Gitblit v1.8.0