From a5df301fce6e16534bec1e9a9d55edd19896fe85 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 15:10:22 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index a173107..1e2cff0 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -539,36 +539,36 @@
// 浣滀笟淇℃伅
OperateResult result = siemensNet.Write("DB100.0", array);
-// int i=0;
-// do{
-// //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
-// try{
-// Thread.sleep(100L);
-// } catch (Exception e){}
-// OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
-// if (resultRead.IsSuccess) {
-// CrnCommand one = new CrnCommand();
-// one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
-// one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
-// one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
-// one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
-// one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
-// one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
-// one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
-// one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
-// if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
-// || !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())
-// ){
-// i++;
-// log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),JSON.toJSON(one));
-// result = siemensNet.Write("DB100.0", array);
-// }else{
-// break;
-// }
-// }
-// }while(i<5);
+ int i=0;
+ do{
+ //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ try{
+ Thread.sleep(100L);
+ } catch (Exception e){}
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
+ if (resultRead.IsSuccess) {
+ CrnCommand one = new CrnCommand();
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+ || !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())
+ ){
+ i++;
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),JSON.toJSON(one));
+ result = siemensNet.Write("DB100.0", array);
+ }else{
+ break;
+ }
+ }
+ }while(i<5);
if (command.getAckFinish() == 0) {
short commandFinish = 1;
--
Gitblit v1.9.1