From 479d51e0c9662bebfe37a48401ec23fbd6496d0e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 27 十月 2022 15:17:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 10463f9..6901ef7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -15,6 +15,7 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.SteChargeType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
@@ -179,8 +180,8 @@
// 鍏呯數淇″彿浣�
Thread.sleep(100);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
- if (result2.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1);
+ if (result3.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
charge0 = status[0];
charge1 = status[1];
charge2 = status[2];
@@ -268,11 +269,31 @@
* @param index 鍏呯數妗╁簭鍙� 0 寮�濮�
* @param open true 寮�濮嬪厖鐢碉紱false 缁撴潫鍏呯數
*/
- public void charge(int index, boolean open) {
- OperateResult write = siemensS7Net.Write("DB102.50." + index + 3, open);
+ public boolean charge(int index, boolean open) {
+ OperateResult write = siemensS7Net.Write("DB102.50." + (index + 3), open);
if (!write.IsSuccess) {
log.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗澶辫触", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
+ return false;
+ } else {
+ log.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗鎴愬姛", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
}
+ return true;
+ }
+
+ /**
+ * 鑾峰彇绌洪棽鍏呯數妗�
+ */
+ public SteChargeType getIdleChargeLocNo() {
+ if (!this.charge0) {
+ return SteChargeType.FIRST;
+ }
+ if (!this.charge1) {
+ return SteChargeType.SECOND;
+ }
+ if (!this.charge2) {
+ return SteChargeType.THIRD;
+ }
+ return null;
}
@Override
--
Gitblit v1.9.1