From 2fddfc8a998c5861ef1c2084f4081d580dbc27d2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 十一月 2023 09:33:14 +0800
Subject: [PATCH] #任务管理运行修改起点-终点数据
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index e63f0ce..f3d986c 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -392,7 +392,7 @@
}
command.setCrnNo(slave.getId());
- short[] array = new short[12];
+ short[] array = new short[10];
if (Cools.isEmpty(command.getAckFinish())) {
array[0] = 5;
} else {
@@ -413,7 +413,7 @@
// }else {
array[4] = command.getSourcePosX();
// }
- array[5] = command.getDestinationPosY();
+ array[5] = command.getSourcePosY();
array[6] = command.getDestinationPosZ();
// if (rowOne.contains(command.getDestinationPosX())){
@@ -429,9 +429,7 @@
// }
array[8] = command.getDestinationPosY();
array[9] = command.getCommand();
- if (!Cools.isEmpty(command.getAuto())){
- array[10] = command.getAuto();
- }
+
// 浣滀笟淇℃伅
@@ -527,9 +525,27 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
+ OperateResult result = new OperateResult();
short[] array = new short[1];
array[0] = command.getAuto();
- OperateResult result = siemensNet.Write("DB100.20", array);
+ if(command.getAuto() !=0){
+ array[0] = command.getAuto();
+ result = siemensNet.Write("DB103.0", array);
+ }else if (command.getOnlineWrk1() != 0){
+ array[0] = command.getOnlineWrk1();
+ result = siemensNet.Write("DB103.2", array);
+ }else if (command.getOnlineWrk2() !=0){
+ array[0] = command.getOnlineWrk2();
+ result = siemensNet.Write("DB103.4", array);
+ }else if (command.getOnlineWrk3() != 0){
+ array[0] = command.getOnlineWrk3();
+ result = siemensNet.Write("DB103.6", array);
+ }else if (command.getOnlineWrk4() != 0){
+ array[0] = command.getOnlineWrk4();
+ result = siemensNet.Write("DB103.8", array);
+ }
+
+
//鏇存柊鍛戒护鏃ュ織
CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
--
Gitblit v1.9.1