From 572a655759f4f8fcfce2c89db491dd837327527a Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 03 十一月 2025 09:54:09 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 454 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 345 insertions(+), 109 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 99572e0..7afd2ba 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.254:1433;databasename=ahyxasrs
+ url: jdbc:sqlserver://10.10.10.201:1433;databasename=ahyxasrs
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
username: sa
password: sa@123
@@ -118,7 +118,9 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 261
- staNoOther: 261
+ staNoOther: 257
+ staNoOther1: 256
+ staNoOther2: 255
row: 10
bay: 1
lev: 1
@@ -144,7 +146,9 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 260
- staNoOther: 260
+ staNoOther: 248
+ staNoOther1: 247
+ staNoOther2: 246
row: 12
bay: 1
lev: 1
@@ -170,7 +174,9 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 259
- staNoOther: 259
+ staNoOther: 239
+ staNoOther1: 238
+ staNoOther2: 237
row: 14
bay: 1
lev: 1
@@ -243,32 +249,54 @@
rack: 0
slot: 0
# 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
- singleSta[0]:
- staNo: 153
- # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�2
- singleSta[1]:
- staNo: 145
- # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
inSingleSta[0]:
- staNo: 174
+ staNo: 173
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+
# 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInSingleSta[0]:
staNo: 104
+ led: ${wcs-slave.led[2].id}
# 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInSingleSta[1]:
- staNo: 173
+ staNo: 126
+ led: ${wcs-slave.led[3].id}
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+ emptyInSingleSta[2]:
+ staNo: 131
+ led: ${wcs-slave.led[3].id}
+ # # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+# emptyInSingleSta[1]:
+# staNo: 173
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
inLargeSta[0]:
staNo: 292
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[2].id}
+
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
inLargeSta[1]:
staNo: 281
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[2].id}
+
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInLargeSta[0]:
staNo: 292
+ led: ${wcs-slave.led[2].id}
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
emptyInLargeSta[1]:
staNo: 281
+ led: ${wcs-slave.led[2].id}
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
+ emptyInLargeSta[2]:
+ staNo: 310
+ led: ${wcs-slave.led[3].id}
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
+ emptyInLargeSta[3]:
+ staNo: 312
+ led: ${wcs-slave.led[3].id}
# 杈撻�佺嚎
devp[1]:
id: 2
@@ -279,57 +307,109 @@
# 绌烘澘鍏ュ簱鍙�1(涓存椂)
emptyInSta[0]:
staNo: 511
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1(涓存椂)
+ emptyInSta[1]:
+ staNo: 515
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1(涓存椂)
+ emptyInSta[2]:
+ staNo: 536
+ led: ${wcs-slave.led[1].id}
+# # 绌烘澘鍏ュ簱鍙�1(涓存椂)
+# emptyInSta[3]:
+# staNo: 607
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 460
+ barcode: ${wcs-slave.barcode[6].id}
+ led: ${wcs-slave.led[3].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 453
+ barcode: ${wcs-slave.barcode[5].id}
+ led: ${wcs-slave.led[3].id}
+ # 鍏ュ簱鍙�464
+ inSta464[0]:
+ staNo: 464
+ barcode: ${wcs-slave.barcode[10].id}
+ led: ${wcs-slave.led[3].id}
+
# 鍏ョ～鍖栫綈RGV
enterRgv[0]:
rgvNo: 623
steNo: 1
jarRegin: 1
- burial: 1
+ burial: 5
staNoEnter[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 113
- row: 1
+ staNo: 612
+ row: 3
staNoEnter[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 114
- row: 3
+ staNo: 615
+ row: 1
# 鍏ョ～鍖栫綈RGV
enterRgv[1]:
rgvNo: 624
- steNo: 1
+ steNo: 2
jarRegin: 1
- burial: 1
+ burial: 6
staNoEnter[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 113
- row: 1
+ staNo: 619
+ row: 3
staNoEnter[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 114
- row: 3
+ staNo: 622
+ row: 1
# 鍑虹～鍖栫綈RGV
endRgv[0]:
rgvNo: 625
steNo: 1
jarNo: 1
jarRegin: 1
- burial: 1
+ burial: 5
staNoEnd[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 114
+ staNo: 627
row: 1
# 鍑虹～鍖栫綈RGV
endRgv[1]:
rgvNo: 626
- steNo: 1
- jarNo: 1
+ steNo: 2
+ jarNo: 3
jarRegin: 1
- burial: 1
+ burial: 6
staNoEnd[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 114
+ staNo: 628
row: 1
+ # 澶ф枡绠� 纭寲瀹屾垚 鍏ュ簱鍙�1
+ outJarInSta[0]:
+ staNo: 627
+ led: ${wcs-slave.led[1].id}
+ JarList[0]:
+ jarNo: 1
+ endStaNo: 518
+ burial: 5
+ JarList[1]:
+ jarNo: 2
+ endStaNo: 518
+ burial: 5
+ # 澶ф枡绠� 纭寲瀹屾垚 鍏ュ簱鍙�2
+ outJarInSta[1]:
+ staNo: 628
+ led: ${wcs-slave.led[1].id}
+ JarList[0]:
+ jarNo: 3
+ endStaNo: 518
+ burial: 6
+ JarList[1]:
+ jarNo: 4
+ endStaNo: 518
+ burial: 6
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -355,13 +435,37 @@
id: 5
ip: 10.10.10.52
port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[5]:
+ id: 6
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[6]:
+ id: 7
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[7]:
+ id: 8
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[8]:
+ id: 9
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[9]:
+ id: 10
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[10]:
+ id: 11
+ ip: 10.10.10.52
+ port: 51236
# LED1
- led[0]:
- id: 1
- ip: 192.168.18.5
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 144
# JAR1
jar[0]:
id: 1
@@ -371,23 +475,16 @@
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- rgvNo: 102
- steNo: 102
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
- row: 1
+ staNo: 612
+ rgvNo: 623
+ steNo: 1
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
+ staNo: 627
+ rgvNo: 625
+ steNo: 1
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
@@ -398,7 +495,7 @@
jarOutRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
rgvNo: 625
- row: 2
+ row: 1
# 纭寲缃愬叆搴撶┛姊澘
jarInSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
@@ -407,8 +504,8 @@
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 3
- row: 2
+ steNo: 1
+ row: 1
# JAR2
jar[1]:
id: 2
@@ -418,44 +515,37 @@
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- rgvNo: 102
- steNo: 102
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
+ staNo: 615
+ rgvNo: 623
+ steNo: 1
row: 1
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 623
- rgvNo: 102
- steNo: 102
+ staNo: 627
+ rgvNo: 625
+ steNo: 1
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 625
+ rgvNo: 623
row: 1
# 纭寲缃愬嚭搴揜GV
jarOutRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
- row: 2
+ rgvNo: 625
+ row: 1
# 纭寲缃愬叆搴撶┛姊澘
jarInSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
+ steNo: 1
row: 1
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
- row: 2
+ steNo: 1
+ row: 1
# JAR3
jar[2]:
id: 3
@@ -465,43 +555,36 @@
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- rgvNo: 102
- steNo: 102
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
- row: 1
+ staNo: 619
+ rgvNo: 624
+ steNo: 2
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
+ staNo: 628
+ rgvNo: 626
+ steNo: 2
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
+ rgvNo: 624
row: 1
# 纭寲缃愬嚭搴揜GV
jarOutRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
+ rgvNo: 626
row: 2
# 纭寲缃愬叆搴撶┛姊澘
jarInSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
- row: 1
+ steNo: 2
+ row: 2
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
+ steNo: 2
row: 2
# JAR4
jar[3]:
@@ -512,23 +595,56 @@
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- rgvNo: 102
- steNo: 102
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
- row: 1
+ staNo: 622
+ rgvNo: 624
+ steNo: 2
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
+ staNo: 628
+ rgvNo: 626
+ steNo: 2
+ row: 1
+ # 纭寲缃愬叆搴揜GV
+ jarInRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 624
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 626
+ row: 2
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 2
+ row: 2
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 2
+ row: 2
+ # 鍐峰嵈妲�5
+ jar[4]:
+ id: 5
+ ip: 10.10.10.190
+ port: 120
+ jarOtherId: 2
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 612
+ rgvNo: 623
+ steNo: 1
+ row: 3
+ # 纭寲缃愬嚭搴撶珯鐐�
+ jarOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 627
+ rgvNo: 625
+ steNo: 1
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
@@ -538,8 +654,8 @@
# 纭寲缃愬嚭搴揜GV
jarOutRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
- row: 2
+ rgvNo: 625
+ row: 1
# 纭寲缃愬叆搴撶┛姊澘
jarInSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
@@ -548,19 +664,139 @@
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 1
+ row: 1
+ # 鍐峰嵈妲�6
+ jar[5]:
+ id: 6
+ ip: 10.10.10.193
+ port: 120
+ jarOtherId: 3
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 619
+ rgvNo: 624
+ steNo: 2
+ row: 3
+ # 纭寲缃愬嚭搴撶珯鐐�
+ jarOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 628
+ rgvNo: 626
+ steNo: 2
+ row: 1
+ # 纭寲缃愬叆搴揜GV
+ jarInRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 624
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 626
+ row: 2
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 2
+ row: 2
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
steNo: 2
row: 2
# ste1
ste[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.10.10.170
port: 502
rack: 0
slot: 0
+ # 鍏ュ簱绔欑偣
+ steInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 612
+ rgvNo: 623
+ jarNo: 1
+ row: 3
+ # 鍏ュ簱绔欑偣
+ steInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 615
+ rgvNo: 623
+ jarNo: 2
+ row: 1
# ste2
ste[1]:
id: 2
- ip: 10.10.10.10
+ ip: 10.10.10.175
port: 502
rack: 0
- slot: 0
\ No newline at end of file
+ slot: 0
+ # 鍏ュ簱绔欑偣
+ steInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 619
+ rgvNo: 624
+ jarNo: 3
+ row: 3
+ # 鍏ュ簱绔欑偣
+ steInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 622
+ rgvNo: 624
+ jarNo: 4
+ row: 1
+ # 纾呯Г
+ scale[0]:
+ id: 1
+ ip: 10.10.10.207
+ port: 5005
+ staNo: 281
+ # 纾呯Г
+ scale[1]:
+ id: 2
+ ip: 10.10.10.206
+ port: 5005
+ staNo: 292
+ # 纾呯Г
+ scale[2]:
+ id: 3
+ ip: 10.10.10.209
+ port: 5005
+ staNo: 453
+ # 纾呯Г
+ scale[3]:
+ id: 4
+ ip: 10.10.10.208
+ port: 5005
+ staNo: 460
+ # LED1 鍗婃垚鍝佸簱
+ led[0]:
+ id: 1
+ ip: 10.10.10.220
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 220
+ # LED2 鐮寸鍖�
+ led[1]:
+ id: 2
+ ip: 10.10.10.221
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 221
+ # LED3 浜屾ゼ鍘熸枡鍖�
+ led[2]:
+ id: 3
+ ip: 10.10.10.222
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 222
+ # LED4 瀵嗙偧鍖�
+ led[3]:
+ id: 4
+ ip: 10.10.10.223
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 223
\ No newline at end of file
--
Gitblit v1.9.1