From d3691a8120a37d91892981133e23901b1c209e79 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 09 四月 2024 20:53:53 +0800
Subject: [PATCH] 移库优先
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 3bd2c0a..441ebcc 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -336,7 +336,7 @@
// crnCommand.setDestinationStaNo(command.getDestinationStaNo());
crnCommand.setCommand(command.getCommand());
if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
- command.setTaskNo((short) 9999);
+ command.setTaskNo((short) 999);
}
command.setCrnNo(slave.getId());
@@ -348,12 +348,12 @@
}
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
- array[3] = command.getSourcePosZ();
- array[4] = command.getSourcePosX();
- array[5] = command.getSourcePosY();
- array[6] = command.getDestinationPosZ();
- array[7] = command.getDestinationPosX();
- array[8] = command.getDestinationPosY();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
array[9] = command.getCommand();
// 浣滀笟淇℃伅
@@ -409,9 +409,9 @@
one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
// one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
// one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
- if (!crnCommand.getTaskNo().equals(one.getTaskNo()) && !crnCommand.getAckFinish().equals(one.getAckFinish())
- && !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) && !crnCommand.getSourcePosX().equals(one.getSourcePosX()) && !crnCommand.getSourcePosY().equals(one.getSourcePosY())
- && !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) && !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) && !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
+ if (!crnCommand.getTaskNo().equals(one.getTaskNo()) || !crnCommand.getAckFinish().equals(one.getAckFinish())
+ || !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) || !crnCommand.getSourcePosX().equals(one.getSourcePosX()) || !crnCommand.getSourcePosY().equals(one.getSourcePosY())
+ || !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) || !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) || !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
){
log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand));
@@ -454,7 +454,7 @@
// crnCommand.setDestinationStaNo(command.getDestinationStaNo());
crnCommand.setCommand(command.getCommand());
if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
- command.setTaskNo((short) 9999);
+ command.setTaskNo((short) 999);
}
command.setCrnNo(slave.getId());
@@ -466,17 +466,16 @@
}
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
- array[3] = command.getSourcePosZ();
- array[4] = command.getSourcePosX();
- array[5] = command.getSourcePosY();
- array[6] = command.getDestinationPosZ();
- array[7] = command.getDestinationPosX();
- array[8] = command.getDestinationPosY();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
array[9] = command.getCommand();
// 浣滀笟淇℃伅
OperateResult result = siemensNet.Write("DB100.0", array);
// 鏃ュ織璁板綍
-// try {
if (command.getAckFinish() != 1) {
BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
BasCrnOpt basCrnOpt = new BasCrnOpt(
--
Gitblit v1.9.1