From 6e1a29fbb8b364337d1f14693a4b573ef4ab43dc Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 十一月 2025 15:43:16 +0800
Subject: [PATCH] wcs界面完善
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index cfc018f..fffae0f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -25,10 +25,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;
/**
@@ -44,12 +41,23 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
private StaError1 staError1;
- public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);
- }};
+ public static final ArrayList<Integer> staNos;
+
+ static {
+ ArrayList<Integer> list = new ArrayList<>();
+ for (int i = 1; i <= 48; i++) {
+ list.add(1000 + i);
+ }
+ for (int i = 9; i <= 40; i++) {
+ list.add(1100 + i);
+ }
+ list.add(1701);
+ list.add(1702);
+ staNos = list; // 涓嶅彲淇敼锛屽畨鍏�
+ }
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
- add(1); add(2);
+ add(1); add(2);add(3); add(4);add(5); add(6);add(7); add(8);
}};
public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
add(104); add(106);
--
Gitblit v1.9.1