From 343ee21510a9c9609e9c73c8c7073540b6caad19 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 21 七月 2025 15:16:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 7 ++-----
src/main/resources/application.yml | 18 ++++++------------
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a9be2e8..e387434 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -54,11 +54,10 @@
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(300);add(301);add(302);add(303);add(304);
- }};
-
- public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
add(311);add(312);add(313);add(314);add(315);
}};
+
+
public static final ArrayList<Integer> barcode1 = new ArrayList<Integer>() {{
add(1); add(2);
@@ -97,8 +96,6 @@
return staNos1;
case 2:
return staNos2;
- case 3:
- return staNos3;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4852f29..65edd93 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -218,27 +218,21 @@
staNo: 301
led: ${wcs-slave.led[2].id}
- # 杈撻�佺嚎2
- devp[2]:
- id: 3
- ip: 10.10.10.140
- port: 0
- rack: 0
- slot: 0
+
# 鍏ュ簱鍙�1
- inSta[0]:
+ inSta[1]:
staNo: 311
barcode: ${wcs-slave.barcode[3].id}
backSta: 312
led: ${wcs-slave.led[5].id}
# 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
+ emptyInSta[1]:
staNo: 311
barcode: ${wcs-slave.barcode[3].id}
led: ${wcs-slave.led[5].id}
backSta: 312
# 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
+ pickSta[1]:
staNo: 311
barcode: ${wcs-slave.barcode[3].id}
led: ${wcs-slave.led[5].id}
@@ -291,12 +285,12 @@
id: 5
ip: 10.10.10.110
port: 5005
- devpPlcId: ${wcs-slave.devp[2].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staArr: 311
# LED4
led[5]:
id: 6
ip: 10.10.10.111
port: 5005
- devpPlcId: ${wcs-slave.devp[2].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staArr: 314
\ No newline at end of file
--
Gitblit v1.9.1