From 056cf9d0311e1345017ab4c52c5946144fb4ccb8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 十月 2024 15:03:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index e08db4f..ede2985 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -272,7 +272,7 @@
// convertRow(command);
command.setCrnNo(slave.getId());
// short[] array = new short[10];
- short[] array = new short[10];
+ short[] array = new short[11];
array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
array[1] = command.getTaskNo(); // 浠诲姟鍙�
array[2] = command.getTaskMode(); // 妯″紡
@@ -283,12 +283,11 @@
array[7] = command.getDestinationPosY(); // 鐩爣浣嶇疆鍒楀彿
array[8] = command.getDestinationPosZ(); // 鐩爣浣嶇疆灞傚彿
array[9] = command.getCommand();
-// array[10] = 0; //澶囩敤1
+ array[10] = command.getTraySize(); //澶囩敤1
- boolean[] array2 = new boolean[1];
- array2[0] = command.isTraySize();
+
OperateResult result = siemensNet.Write("DB100.0", array);
- OperateResult result2 = siemensNet.Write("DB100.22", array2);
+
News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
@@ -297,11 +296,10 @@
do {
try{
- if(!result.IsSuccess || !result2.IsSuccess){
+ if(!result.IsSuccess ){
News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
// MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
result = siemensNet.Write("DB100.0", array);
- result2 = siemensNet.Write("DB100.22", array2);
Thread.sleep(100);
writeCount1++;
continue;
@@ -317,12 +315,12 @@
one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
- one.setTraySize(siemensNet.getByteTransform().TransBool(resultRead.Content, 22));
+ one.setTraySize(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
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())
- || !command.isTraySize() == one.isTraySize()
+ || !command.getTraySize().equals(one.getTraySize())
){
try{
News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
@@ -344,7 +342,6 @@
// MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
result = siemensNet.Write("DB100.0", array);
- result2 = siemensNet.Write("DB100.22", array2);
writeCount1++;
continue;
--
Gitblit v1.9.1