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 | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 56bb030..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;
@@ -48,6 +49,10 @@
add(210);add(211);
add(300);
}};
+
+ public boolean charge0;
+ public boolean charge1;
+ public boolean charge2;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -159,7 +164,7 @@
}
//璇绘潯鐮�
- Thread.sleep(200);
+ Thread.sleep(100);
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(barcodeSize*8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
@@ -170,6 +175,16 @@
}
}
+ }
+
+ // 鍏呯數淇″彿浣�
+ Thread.sleep(100);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
+ if (result3.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
+ charge0 = status[0];
+ charge1 = status[1];
+ charge2 = status[2];
}
if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
@@ -249,6 +264,38 @@
}
}
+ /**
+ * 鍏呯數鎺у埗
+ * @param index 鍏呯數妗╁簭鍙� 0 寮�濮�
+ * @param open true 寮�濮嬪厖鐢碉紱false 缁撴潫鍏呯數
+ */
+ 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
public void close() {
siemensS7Net.ConnectClose();
--
Gitblit v1.9.1