From 17e4c7e3e7b3ef60d9da6de3b2a39a14a53c38a0 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期三, 12 三月 2025 14:11:33 +0800
Subject: [PATCH] 1
---
WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine.cs b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine.cs
index 28b40e2..3bd6d52 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine.cs
@@ -30,6 +30,9 @@
namespace WIDESEAWCS_QuartzJob
{
+ /// <summary>
+ /// 杈撻�佺嚎瀹炵幇瀵硅薄
+ /// </summary>
[Description("杈撻�佺嚎")]
public class CommonConveyorLine : IConveyorLine
{
@@ -148,15 +151,15 @@
/// 璇诲彇PLC鍗忚鍦板潃鐨勬暟鎹�
/// </summary>
/// <typeparam name="TEnum">鍗忚淇℃伅鐨勬灇涓惧璞′俊鎭��</typeparam>
- /// <typeparam name="TRsult">璇诲彇鏁版嵁鐨勭被鍨嬪璞′俊鎭��</typeparam>
+ /// <typeparam name="TResult">璇诲彇鏁版嵁鐨勭被鍨嬪璞′俊鎭��</typeparam>
/// <param name="value">鏋氫妇鍊�</param>
/// <param name="deviceChildCode">璁惧瀛愮紪鍙�</param>
/// <returns>璇诲彇鍒扮殑鏁版嵁</returns>
- public TRsult GetValue<TEnum, TRsult>(TEnum value, string deviceChildCode) where TEnum : Enum
+ public TResult GetValue<TEnum, TResult>(TEnum value, string deviceChildCode) where TEnum : Enum
{
if (!IsConnected) throw new Exception($"閫氳杩炴帴閿欒锛岃妫�鏌ョ綉缁�");
DeviceProDTO? devicePro = _deviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == value.ToString() && x.DeviceChildCode == deviceChildCode);
- return devicePro == null ? throw new Exception() : (TRsult)Communicator.ReadAsObj(devicePro.DeviceProAddress, devicePro.DeviceDataType);
+ return devicePro == null ? throw new Exception($"璇诲彇鏁版嵁閿欒,鏈湪鍗忚淇℃伅閲岄潰鎵惧埌鍙傛暟{value.ToString()}") : (TResult)Communicator.ReadAsObj(devicePro.DeviceProAddress, devicePro.DeviceDataType);
}
/// <summary>
@@ -234,13 +237,13 @@
{
if (!IsConnected) throw new Exception($"閫氳杩炴帴閿欒锛岃妫�鏌ョ綉缁�");
DeviceProDTO? devicePro = _deviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == @enum.ToString() && x.DeviceChildCode == deviceChildCode);
- return devicePro == null ? throw new Exception() : Communicator.WriteObj(devicePro.DeviceProAddress, devicePro.DeviceDataType, value);
+ return devicePro == null ? throw new Exception($"鍐欏叆鏁版嵁閿欒,鏈湪鍗忚淇℃伅閲岄潰鎵惧埌鍙傛暟{value.ToString()}") : Communicator.WriteObj(devicePro.DeviceProAddress, devicePro.DeviceDataType, value);
}
/// <summary>
- ///
+ /// 鏄惁鍗犱綅
/// </summary>
- /// <param name="deviceChildCode"></param>
+ /// <param name="deviceChildCode">璁惧瀛愮紪鍙�</param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public bool IsOccupied(string deviceChildCode)
@@ -270,10 +273,16 @@
return false;
}
+ /// <summary>
+ /// 閲婃斁瀵硅薄
+ /// </summary>
public void Dispose()
{
+ // 璁剧疆蹇冭烦鐘舵�佷负false
_heartStatr = false;
+ // 閲婃斁閫氫俊鍣ㄨ祫婧�
_communicator.Dispose();
+ // 鍛婅瘔鍨冨溇鍥炴敹鍣ㄤ笉鍐嶈皟鐢ㄧ粓缁撳櫒
GC.SuppressFinalize(this);
}
#endregion
--
Gitblit v1.9.3