From 432aa30874196937f6250b34c7ef6fb62dbaf984 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 29 三月 2025 15:52:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 36053dd..d807363 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -56,6 +56,11 @@
add(1131);add(1132);add(1133);add(1134);add(1135);
}};
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(1112);add(1114);add(1122);add(1124);add(1131);
+
+ }};
+
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(1112); add(1122);
}};
@@ -205,8 +210,8 @@
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setIdle(status[1]); //绌洪棽
staProtocol.setLoading(status[2]); // 鏈夌墿
-// staProtocol.setInEnable(status[2]); // 鍙叆
-// staProtocol.setOutEnable(status[3]);// 鍙嚭
+ staProtocol.setIn(status[3]);
+ staProtocol.setOut(status[4]);
staProtocol.setBackErr(status[5]);
staProtocol.setLeftErr(status[6]);
staProtocol.setRightErr(status[7]);
@@ -214,6 +219,9 @@
staProtocol.setWeightErr(status[9]);
staProtocol.setLow(status[10]);
staProtocol.setHigh(status[11]);
+
+ staProtocol.setInEnable(status[13]); // 鍙叆
+ staProtocol.setOutEnable(status[14]);// 鍙嚭
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*26+2)); // 宸ヤ綔鍙�
@@ -267,14 +275,13 @@
if (null == staProtocol) {
return;
}
- ArrayList<Integer> staNos = getStaNo();
- int index = staNos.indexOf(staProtocol.getSiteId());
+ int index = staNos2.indexOf(staProtocol.getSiteId());
OperateResult write = null;
OperateResult write1 = null;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB83." + index*8+6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ write = siemensS7Net.Write("DB83." + (index*8+6), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(200);
write1 = siemensS7Net.Write("DB83." + (index*8+4), staProtocol.getStaNo()); // 鐩爣绔�
if(write.IsSuccess && write1.IsSuccess){
--
Gitblit v1.9.1