From cd87c057ec64e917105bd85e4f562b54f7b165d7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 17:31:26 +0800
Subject: [PATCH] 堆垛机任务下发优化
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 24 ++++++++++++++++--------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/resources/license.lic | 0
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8684907..2dea637 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1131,7 +1131,7 @@
crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
- crnCommand.setCommand((short) 1);
+ crnCommand.setCommand((short) 0);
log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}", crnCommand);
if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
@@ -1242,7 +1242,7 @@
command.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
- command.setCommand((short) 1);
+ command.setCommand((short) 0);
if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command), false)) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(command));
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 04573b7..70fac4b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -183,13 +183,20 @@
// crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
// crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
if(slave.getId()==3){
- crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 28));
- crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 30));
- crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setXDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 34));
- crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 38));
- crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 40));
+// crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 28));
+// crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 30));
+// crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 32));
+// crnProtocol.setXDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 34));
+// crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 36));
+// crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 38));
+// crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 40));
+ crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+ crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
+ crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
}else{
crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
@@ -407,7 +414,8 @@
OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
Thread.sleep(100L);
OperateResult result = siemensNet.Write("DB100.0", array);
-
+ Thread.sleep(100L);
+ OperateResult result1 = siemensNet.Write("DB100.10", 1);
int i=0;
do{
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 850d164..c4f4742 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1