From c2637f74a396410707ce6e5cf64421fe7a9ca851 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 16 六月 2025 09:43:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index fa6cc64..68b9ebe 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -296,10 +296,10 @@
do {
try{
if(!result.IsSuccess ){
- if (!resetFlag){
+// if (!resetFlag){
News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
result = siemensNet.Write("DB100.0", array);
- }
+// }
Thread.sleep(100);
writeCount1++;
continue;
@@ -307,6 +307,7 @@
OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 18);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
+ one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
@@ -319,6 +320,7 @@
|| !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
|| !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
|| !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+ || !command.getAckFinish().equals(one.getAckFinish())
){
try{
News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
@@ -335,10 +337,10 @@
}catch (Exception e){
}
- if (!resetFlag){
+// if (!resetFlag){
News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
result = siemensNet.Write("DB100.0", array);
- }
+// }
writeCount1++;
continue;
} else {
@@ -600,7 +602,7 @@
// if (result != null && result.IsSuccess) {
// Thread.sleep(200);
// this.readStatus();
-//// News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+//// News.info("鍫嗗灈鏈哄懡浠や笅鍙慬{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
// OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
// return true;
// } else {
--
Gitblit v1.9.1