Merge branch 'master' of https://gitea.star-rising.cn/vcrmn/CheckDevice

Check.Main/Check.Main.csproj

@@ -39,7 +39,7 @@
       <HintPath>..\..\..\HslCommunication-master\HslCommunication.dll</HintPath>
     </Reference>
     <Reference Include="MvCameraControl.Net">
-      <HintPath>C:\Program Files (x86)\MVS\Development\DotNet\win64\MvCameraControl.Net.dll</HintPath>
+      <HintPath>..\..\XKRS2025\CheckDevice\Check.Main\bin\Debug\MvCameraControl.Net.dll</HintPath>
     </Reference>
   </ItemGroup>
 

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
 {
@@ -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)

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
 {
     // 对单个图像进行模板匹配