From f75ab7eb69a218aa79ccc77c092887f009d16f90 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 07 二月 2025 08:20:10 +0800
Subject: [PATCH] 米多泉州wcs初始配置完成
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 5c16180..9fe3d21 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -26,10 +26,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -46,7 +43,7 @@
private short heartBeatVal = 1;
private StaError1 staError1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);
+ add(1002);add(1020);add(1035);add(103);
add(104);add(105);add(106);add(107);
add(200);add(201);add(202);add(203);add(210);
add(300);add(301);add(302);add(303);add(304);add(305);
@@ -106,7 +103,7 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol)task.getData());
- log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
+// log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
break;
// 鍐欏紑闂�
case 3:
@@ -133,6 +130,7 @@
booleans[1] = true; // 鍏抽棬淇″彿
booleans[0] = false;
siemensS7Net.Write("DB100.826",booleans);
+ log.info("涓嬪彂鍏抽棬淇″彿鎴愬姛锛�" + Arrays.toString(booleans));
}
} else if(flag == 1) {
OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
@@ -141,6 +139,7 @@
booleans[0] = true; // 寮�闂ㄤ俊鍙�
booleans[1] = false;
siemensS7Net.Write("DB100.826",booleans);
+ log.info("涓嬪彂寮�闂ㄤ俊鍙锋垚鍔燂細" + Arrays.toString(booleans));
}
}
Thread.sleep(500);
@@ -157,6 +156,7 @@
staProtocol.setCloseAskDoor(booleans[1]);
staProtocol.setIfOpenDoor(booleans[2]);
staProtocol.setIfCloseDoor(booleans[3]);
+ log.info("涓嬪彂寮�鍏抽棬鍚庡洖璇伙細" + Arrays.toString(booleans));
}
}
@@ -368,7 +368,7 @@
OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.1652", (short) ((staNosErrList.size()+1)*4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
if (resultErr.IsSuccess){
for (int i = 0;i<staNosErrList.size();i++){
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*9+2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*8+2, 1);
StaProtocol staProtocol = station.get(staNosErrList.get(i));
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
--
Gitblit v1.9.1