From 007782bf44e49b4e3d5166ef361ac9fd03cad9c2 Mon Sep 17 00:00:00 2001
From: kingno <30263@KINGNO>
Date: 星期二, 17 六月 2025 13:07:43 +0800
Subject: [PATCH] 合并
---
src/Bro.M141.Process/M141Process.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index dc29ff2..a68780c 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -38,8 +38,11 @@
public M141Process(string productCode) : base(productCode) { }
#endregion
+
TaskFactory _taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.LongRunning);
+
public event Action<string, P_PRODUCT_DETAIL, string> OnSinglePostionDetectResultUpdate;
+
protected M141Config M141Config => Config as M141Config;
public static object _productListLock = new object();
@@ -55,7 +58,6 @@
public override void InitialProcessMethods()
{
base.InitialProcessMethods();
-
if (ThHeartPlc == null)
{
@@ -82,7 +84,6 @@
bool devicestate = false;
PLCBase Plc2;
public Thread ThHeartPlc;
-
public override void Open()
@@ -120,6 +121,7 @@
base.Close();
}
+
public void Heartplc()
{
@@ -417,8 +419,6 @@
Dictionary<string, List<string>> _positionSpecHeads = new Dictionary<string, List<string>>();
-
-
volatile int uploadId = 0;
@@ -512,8 +512,8 @@
// dicpid[tem] = pidList[i];
//}
-
- List<DetectResult> detectResults = ML?.RunMLDetectionSync(imgSet, pidList, measureBind.DetectionId);
+ //var c=products[0].ImagePaths;
+ List<DetectResult> detectResults = ML?.RunMLDetectionSync(imgSet, pidList, measureBind.DetectionId,false,null,null,"", products[0].ImagePaths);
List<DetectResult> ngResults = new List<DetectResult>();
--
Gitblit v1.8.0