From c6bb29dc8c1964953e0f180cfa7f91ab0ee22777 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 16 七月 2024 16:50:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 6 ++++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
2 files changed, 6 insertions(+), 4 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 6c044d3..faa0281 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4561,7 +4561,7 @@
sign[0] = 2;
sign[1] = 1;
}
- break;
+ return false;
case 3:
if (crnProtocol.getStatusTypeTwo() == CrnStatusType.IDLE
&& crnProtocol.getTaskNoTwo() == 0
@@ -4579,7 +4579,7 @@
sign[0] = 2;
sign[1] = 2;
}
- break;
+ return false;
default:
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index f860ea4..699d8dc 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -117,7 +117,7 @@
write5(command2);
break;
// 鍙屽伐浣嶅悓鏃朵綔涓�
- case 7:
+ case 9:
write9((CrnCommandParam) task.getData());
break;
default:
@@ -615,7 +615,7 @@
return false;
}
command.setCrnNo(slave.getId());
- short[] array = new short[20];
+ short[] array = new short[22];
array[0] = command.getAckFinish();
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
@@ -636,6 +636,8 @@
array[17] = command.getDestinationPosY2();
array[18] = command.getDestinationPosZ2();
array[19] = command.getCommand();
+ array[20] = (short)1;
+ array[21] = (short)1;
OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
OperateResult result38 = siemensNet.Write("DB100.38", (short)0);
OperateResult result = siemensNet.Write("DB100.0", array);
--
Gitblit v1.9.1