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_Communicator/AllenBrandly/AllenBrandlyEtherNetCommunicator.cs | 92 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 35 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Communicator/AllenBrandly/AllenBrandlyEtherNetCommunicator.cs b/WIDESEAWCS_Server/WIDESEAWCS_Communicator/AllenBrandly/AllenBrandlyEtherNetCommunicator.cs
index f1d4ae7..b108857 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Communicator/AllenBrandly/AllenBrandlyEtherNetCommunicator.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Communicator/AllenBrandly/AllenBrandlyEtherNetCommunicator.cs
@@ -70,6 +70,11 @@
/// </summary>
public override bool IsConnected => _connected;
+ /// <summary>
+ /// 鏄惁鍦ㄥ啓鍏ユ暟鎹悗璇诲彇鏁版嵁纭銆�
+ /// </summary>
+ public override bool IsReadAfterWrite { get; set; } = true;
+
#endregion Public Member
#region Constructor Function
@@ -143,24 +148,31 @@
}
else
{
- object? obj = null;
- for (int i = 0; i < 5; i++)
+ if (IsReadAfterWrite)
{
- T readValue = Read<T>(address);
- stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAfterRead, readValue, value));
- obj = readValue;
- if (readValue.Equals(value))
+ object? obj = null;
+ for (int i = 0; i < 5; i++)
{
- stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAndReadCheckSuccess, address, value, readValue));
- return true;
+ T readValue = Read<T>(address);
+ stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAfterRead, readValue, value));
+ obj = readValue;
+ if (readValue.Equals(value))
+ {
+ stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAndReadCheckSuccess, address, value, readValue));
+ return true;
+ }
+ else if (i < 4)
+ {
+ Write(address, value);
+ }
}
- else if (i < 4)
- {
- Write(address, value);
- }
+ stringBuilder.AppendLine(string.Format(CommunicationExceptionMessage.WriteAndReadCheckFaild, address, value, obj));
+ throw new CommunicationException(stringBuilder.ToString(), CommunicationErrorType.WriteFailed);
}
- stringBuilder.AppendLine(string.Format(CommunicationExceptionMessage.WriteAndReadCheckFaild, address, value, obj));
- throw new CommunicationException(stringBuilder.ToString(), CommunicationErrorType.WriteFailed);
+ else
+ {
+ return true;
+ }
}
}
catch (Exception ex)
@@ -404,6 +416,9 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
public override void Dispose()
{
_isPing = false;
@@ -592,33 +607,40 @@
stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteData, address, JsonConvert.SerializeObject(value)));
if (operateResult.IsSuccess)
{
- object? obj = null;
- for (int i = 0; i < 5; i++)
+ if(IsReadAfterWrite)
{
- T readValue = ReadCustomer<T>(address);
- stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAfterRead, address, JsonConvert.SerializeObject(readValue)));
- obj = readValue;
- PropertyInfo[] propertyInfos = typeof(T).GetProperties();
- for (int j = 0; j < propertyInfos.Length; j++)
+ object? obj = null;
+ for (int i = 0; i < 5; i++)
{
- object? writeValueItem = propertyInfos[j].GetValue(value);
- object? readValueItem = propertyInfos[j].GetValue(readValue);
- if (writeValueItem.Equals(readValueItem))
+ T readValue = ReadCustomer<T>(address);
+ stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAfterRead, address, JsonConvert.SerializeObject(readValue)));
+ obj = readValue;
+ PropertyInfo[] propertyInfos = typeof(T).GetProperties();
+ for (int j = 0; j < propertyInfos.Length; j++)
{
- stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAndReadCheckSuccess, address, JsonConvert.SerializeObject(value), JsonConvert.SerializeObject(readValue)));
+ object? writeValueItem = propertyInfos[j].GetValue(value);
+ object? readValueItem = propertyInfos[j].GetValue(readValue);
+ if (writeValueItem.Equals(readValueItem))
+ {
+ stringBuilder.AppendLine(string.Format(CommunicationInfoMessage.WriteAndReadCheckSuccess, address, JsonConvert.SerializeObject(value), JsonConvert.SerializeObject(readValue)));
+ }
+ else
+ {
+ break;
+ }
+ if (j == propertyInfos.Length - 1)
+ return true;
}
- else
- {
- break;
- }
- if (j == propertyInfos.Length - 1)
- return true;
- }
- plc.WriteCustomer(address, value);
+ plc.WriteCustomer(address, value);
+ }
+ stringBuilder.AppendLine(string.Format(CommunicationExceptionMessage.WriteAndReadCheckFaild, address, JsonConvert.SerializeObject(value), JsonConvert.SerializeObject(obj)));
+ throw new CommunicationException(string.Format(CommunicationExceptionMessage.WriteAndReadCheckFaild, address, JsonConvert.SerializeObject(value), JsonConvert.SerializeObject(obj)), CommunicationErrorType.WriteFailed);
}
- stringBuilder.AppendLine(string.Format(CommunicationExceptionMessage.WriteAndReadCheckFaild, address, JsonConvert.SerializeObject(value), JsonConvert.SerializeObject(obj)));
- throw new CommunicationException(string.Format(CommunicationExceptionMessage.WriteAndReadCheckFaild, address, JsonConvert.SerializeObject(value), JsonConvert.SerializeObject(obj)), CommunicationErrorType.WriteFailed);
+ else
+ {
+ return true;
+ }
}
else
{
--
Gitblit v1.9.3