From d0e94836a1845709c6e8371b8f59025e765fc8b3 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 22 五月 2025 10:14:54 +0800
Subject: [PATCH] #B
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 2
src/main/resources/application.yml | 148 ++++++++++++++++++++++++------------------------
2 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 35e0eae..3e26b40 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -276,7 +276,7 @@
errorMsg = ledThread.getErrorMsg().toString();
}
}
- }
+ }
return R.ok().add(errorMsg);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 561fce7..702776f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -466,109 +466,109 @@
staNo: 123
barcode: ${wcs-slave.barcode[0].id}
backSta: 122
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 223
barcode: ${wcs-slave.barcode[1].id}
backSta: 222
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[6].id}
# 鍏ュ簱鍙�1
inSta[2]:
staNo: 225
barcode: ${wcs-slave.barcode[2].id}
backSta: 224
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[7].id}
# 鍏ュ簱鍙�1
inSta[3]:
staNo: 228
barcode: ${wcs-slave.barcode[3].id}
backSta: 227
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[9].id}
# 鍏ュ簱鍙�1
inSta[4]:
staNo: 231
barcode: ${wcs-slave.barcode[4].id}
backSta: 230
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[11].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 223
barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[6].id}
backSta: 222
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[1]:
staNo: 225
barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[7].id}
backSta: 224
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[2]:
staNo: 228
barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[9].id}
backSta: 227
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[3]:
staNo: 231
barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[11].id}
backSta: 230
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[4]:
staNo: 411
barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[12].id}
backSta: 411
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[5]:
staNo: 412
barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[13].id}
backSta: 412
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[6]:
staNo: 413
barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[14].id}
backSta: 413
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[7]:
staNo: 414
barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[15].id}
backSta: 414
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 123
barcode: ${wcs-slave.barcode[0].id}
backSta: 122
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 223
barcode: ${wcs-slave.barcode[1].id}
backSta: 222
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[6].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[2]:
staNo: 225
barcode: ${wcs-slave.barcode[2].id}
backSta: 224
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[7].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[3]:
staNo: 228
barcode: ${wcs-slave.barcode[3].id}
backSta: 227
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[9].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[4]:
staNo: 231
barcode: ${wcs-slave.barcode[4].id}
backSta: 230
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[11].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 121
@@ -612,145 +612,145 @@
staNo: 102
barcode: ${wcs-slave.barcode[5].id}
backSta: 101
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[16].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 105
barcode: ${wcs-slave.barcode[6].id}
backSta: 104
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[18].id}
# 鍏ュ簱鍙�1
inSta[2]:
staNo: 107
barcode: ${wcs-slave.barcode[7].id}
backSta: 106
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[19].id}
# 鍏ュ簱鍙�1
inSta[3]:
staNo: 109
barcode: ${wcs-slave.barcode[8].id}
backSta: 108
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[20].id}
# 鍏ュ簱鍙�1
inSta[4]:
staNo: 203
barcode: ${wcs-slave.barcode[9].id}
backSta: 202
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[22].id}
# 鍏ュ簱鍙�1
inSta[5]:
staNo: 205
barcode: ${wcs-slave.barcode[10].id}
backSta: 204
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[23].id}
# 鍏ュ簱鍙�1
inSta[6]:
staNo: 208
barcode: ${wcs-slave.barcode[11].id}
backSta: 207
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[25].id}
# 鍏ュ簱鍙�1
inSta[7]:
staNo: 211
barcode: ${wcs-slave.barcode[12].id}
backSta: 210
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[27].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 203
barcode: ${wcs-slave.barcode[9].id}
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[22].id}
backSta: 202
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[1]:
staNo: 205
barcode: ${wcs-slave.barcode[10].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[23].id}
backSta: 204
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[2]:
staNo: 208
barcode: ${wcs-slave.barcode[11].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[25].id}
backSta: 207
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[3]:
staNo: 211
barcode: ${wcs-slave.barcode[12].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[27].id}
backSta: 210
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[4]:
staNo: 401
barcode: ${wcs-slave.barcode[12].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[28].id}
backSta: 401
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[5]:
staNo: 402
barcode: ${wcs-slave.barcode[12].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[29].id}
backSta: 402
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[6]:
staNo: 403
barcode: ${wcs-slave.barcode[12].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[30].id}
backSta: 403
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[7]:
staNo: 404
barcode: ${wcs-slave.barcode[12].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[31].id}
backSta: 404
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 102
barcode: ${wcs-slave.barcode[5].id}
backSta: 101
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[16].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 105
barcode: ${wcs-slave.barcode[6].id}
backSta: 104
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[18].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[2]:
staNo: 107
barcode: ${wcs-slave.barcode[7].id}
backSta: 106
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[19].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[3]:
staNo: 109
barcode: ${wcs-slave.barcode[8].id}
backSta: 108
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[20].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[4]:
staNo: 203
barcode: ${wcs-slave.barcode[9].id}
backSta: 202
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[22].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[5]:
staNo: 205
barcode: ${wcs-slave.barcode[10].id}
backSta: 204
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[23].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[6]:
staNo: 208
barcode: ${wcs-slave.barcode[11].id}
backSta: 207
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[25].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[7]:
staNo: 211
barcode: ${wcs-slave.barcode[12].id}
backSta: 210
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[27].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 103
@@ -843,194 +843,194 @@
port: 51236
# LED1
led[0]:
- id: 1
+ id: 121
ip: 10.10.10.51
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 121
# LED2
led[1]:
- id: 2
+ id: 123
ip: 10.10.10.52
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 123
led[2]:
- id: 3
+ id: 124
ip: 10.10.10.53
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 124
led[3]:
- id: 4
+ id: 125
ip: 10.10.10.54
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 125
led[4]:
- id: 5
+ id: 126
ip: 10.10.10.55
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 126
led[5]:
- id: 6
+ id: 221
ip: 10.10.10.56
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 221
led[6]:
- id: 7
+ id: 223
ip: 10.10.10.57
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 223
led[7]:
- id: 8
+ id: 225
ip: 10.10.10.58
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 225
led[8]:
- id: 9
+ id: 226
ip: 10.10.10.59
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 226
led[9]:
- id: 10
+ id: 228
ip: 10.10.10.60
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 228
led[10]:
- id: 11
+ id: 229
ip: 10.10.10.61
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 229
led[11]:
- id: 12
+ id: 231
ip: 10.10.10.62
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 231
led[12]:
- id: 13
+ id: 411
ip: 10.10.10.63
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 411
led[13]:
- id: 14
+ id: 412
ip: 10.10.10.64
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 412
led[14]:
- id: 15
+ id: 413
ip: 10.10.10.65
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 413
led[15]:
- id: 16
+ id: 414
ip: 10.10.10.66
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 414
led[16]:
- id: 17
+ id: 102
ip: 10.10.10.67
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 102
led[17]:
- id: 18
+ id: 103
ip: 10.10.10.68
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 103
led[18]:
- id: 19
+ id: 105
ip: 10.10.10.69
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 105
led[19]:
- id: 20
+ id: 107
ip: 10.10.10.70
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 107
led[20]:
- id: 21
+ id: 109
ip: 10.10.10.71
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 109
led[21]:
- id: 22
+ id: 201
ip: 10.10.10.72
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 201
led[22]:
- id: 23
+ id: 203
ip: 10.10.10.73
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 203
led[23]:
- id: 24
+ id: 205
ip: 10.10.10.74
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 205
led[24]:
- id: 25
+ id: 206
ip: 10.10.10.75
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 206
led[25]:
- id: 26
+ id: 208
ip: 10.10.10.76
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 208
led[26]:
- id: 27
+ id: 209
ip: 10.10.10.77
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 209
led[27]:
- id: 28
+ id: 211
ip: 10.10.10.78
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 211
led[28]:
- id: 29
+ id: 401
ip: 10.10.10.79
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 401
led[29]:
- id: 30
+ id: 402
ip: 10.10.10.80
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 402
led[30]:
- id: 31
+ id: 403
ip: 10.10.10.81
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 403
led[31]:
- id: 32
+ id: 404
ip: 10.10.10.82
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
--
Gitblit v1.9.1