From 5dedb1a6323ae2ce65cf82541aa9d0eb05f152ac Mon Sep 17 00:00:00 2001 From: 820689062 <820689062@qq.com> Date: Mon, 20 Oct 2025 16:36:27 +0800 Subject: [PATCH 1/3] 10/20 // --- Check.Main/Check.Main.csproj | 2 +- Check.Main/Common/PLC_Control_Base.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Check.Main/Check.Main.csproj b/Check.Main/Check.Main.csproj index e8aa4b0..e03b440 100644 --- a/Check.Main/Check.Main.csproj +++ b/Check.Main/Check.Main.csproj @@ -39,7 +39,7 @@ ..\..\..\HslCommunication-master\HslCommunication.dll - C:\Program Files (x86)\MVS\Development\DotNet\win64\MvCameraControl.Net.dll + ..\..\XKRS2025\CheckDevice\Check.Main\bin\Debug\MvCameraControl.Net.dll diff --git a/Check.Main/Common/PLC_Control_Base.cs b/Check.Main/Common/PLC_Control_Base.cs index 4fb5a57..acb2024 100644 --- a/Check.Main/Common/PLC_Control_Base.cs +++ b/Check.Main/Common/PLC_Control_Base.cs @@ -12,7 +12,7 @@ namespace Check.Main.Common private readonly ModbusTcpNet _plc; private readonly object _lock = new(); public bool IsConnected => _tcpClient != null && _tcpClient.Connected;// - + // public ModbusTcpService(string ip, int port = 502, byte station = 1) { _plc = new ModbusTcpNet(ip, port, station) From e7341bea878c2ec7d57c64fc1cbb4606a59fb336 Mon Sep 17 00:00:00 2001 From: "xhm\\HP" <1173131411@qq.com> Date: Mon, 20 Oct 2025 16:44:55 +0800 Subject: [PATCH 2/3] 10-20 --- Check.Main/Process_Img.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Check.Main/Process_Img.cs b/Check.Main/Process_Img.cs index 7271ad8..9c4cf90 100644 --- a/Check.Main/Process_Img.cs +++ b/Check.Main/Process_Img.cs @@ -9,7 +9,7 @@ using System.Collections.Concurrent; using System.Threading.Tasks; using System.Diagnostics; using System.Threading; - +//cyf public class ProcessImg { // 对单个图像进行模板匹配 From 6eee4eda2483ea10d5ad8019cd75614ea24cbf96 Mon Sep 17 00:00:00 2001 From: 820689062 <820689062@qq.com> Date: Mon, 20 Oct 2025 16:52:00 +0800 Subject: [PATCH 3/3] // --- Check.Main/Common/PLC_Control_Base.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Check.Main/Common/PLC_Control_Base.cs b/Check.Main/Common/PLC_Control_Base.cs index acb2024..6df1f36 100644 --- a/Check.Main/Common/PLC_Control_Base.cs +++ b/Check.Main/Common/PLC_Control_Base.cs @@ -2,7 +2,7 @@ using HslCommunication.ModBus; using System; using System.Net.Sockets; - +// // ModbusTcp读写服务类,线程安全,互斥锁 namespace Check.Main.Common {