From acd7d1d9d2db1c71d91471afa72a25c1871298ac Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期五, 12 七月 2024 22:18:25 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 350 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 247 insertions(+), 103 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 055947f..66754bd 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
@@ -234,34 +234,6 @@
row: 25
bay: 1
lev: 1
- # RGV绌挎杞�1
- rgv[0]:
- id: 1
- ip: 192.168.18.77
- port: 502
- rack: 0
- slot: 0
- #RGV鍏ュ簱婧愮珯鐐�
- rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 100
- rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- #RGV鍑哄簱婧愮珯鐐�
- rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 110
- rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- #RGV鐩爣绔欑偣
- rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 103
# 杈撻�佺嚎
devp[0]:
@@ -271,26 +243,23 @@
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}
# 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInSingleSta[0]:
staNo: 104
- # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
- emptyInSingleSta[1]:
- staNo: 173
+# # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+# emptyInSingleSta[1]:
+# staNo: 173
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
inLargeSta[0]:
staNo: 292
+ barcode: ${wcs-slave.barcode[1].id}
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
inLargeSta[1]:
staNo: 281
+ barcode: ${wcs-slave.barcode[0].id}
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInLargeSta[0]:
staNo: 292
@@ -307,6 +276,67 @@
# 绌烘澘鍏ュ簱鍙�1(涓存椂)
emptyInSta[0]:
staNo: 511
+ # 绌烘澘鍏ュ簱鍙�1(涓存椂)
+ emptyInSta[1]:
+ staNo: 515
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 460
+ barcode: ${wcs-slave.barcode[3].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 453
+ barcode: ${wcs-slave.barcode[4].id}
+ # 鍏ョ～鍖栫綈RGV
+ enterRgv[0]:
+ rgvNo: 623
+ steNo: 1
+ jarRegin: 1
+ burial: 5
+ staNoEnter[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 612
+ row: 3
+ staNoEnter[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 615
+ row: 1
+ # 鍏ョ～鍖栫綈RGV
+ enterRgv[1]:
+ rgvNo: 624
+ steNo: 2
+ jarRegin: 1
+ burial: 6
+ staNoEnter[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 619
+ row: 3
+ staNoEnter[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 622
+ row: 1
+ # 鍑虹～鍖栫綈RGV
+ endRgv[0]:
+ rgvNo: 625
+ steNo: 1
+ jarNo: 1
+ jarRegin: 1
+ burial: 5
+ staNoEnd[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 627
+ row: 1
+ # 鍑虹～鍖栫綈RGV
+ endRgv[1]:
+ rgvNo: 626
+ steNo: 2
+ jarNo: 3
+ jarRegin: 1
+ burial: 6
+ staNoEnd[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 628
+ row: 1
# 鏉＄爜鎵弿浠�
barcode[0]:
@@ -333,6 +363,26 @@
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
# LED1
led[0]:
id: 1
@@ -345,178 +395,272 @@
id: 1
ip: 10.10.10.190
port: 120
+ jarOtherId: 2
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- row: 1
+ staNo: 612
+ rgvNo: 623
+ steNo: 1
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
+ staNo: 627
+ rgvNo: 625
+ steNo: 1
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
+ 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
# JAR2
jar[1]:
id: 2
ip: 10.10.10.191
port: 120
+ jarOtherId: 1
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
+ staNo: 615
+ rgvNo: 623
+ steNo: 1
row: 1
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
+ staNo: 627
+ rgvNo: 625
+ steNo: 1
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
+ 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
ip: 10.10.10.192
port: 120
+ jarOtherId: 4
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- row: 1
+ staNo: 619
+ rgvNo: 624
+ steNo: 2
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 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]:
id: 4
ip: 10.10.10.193
port: 120
+ jarOtherId: 3
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- row: 1
+ staNo: 619
+ rgvNo: 624
+ steNo: 2
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 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
+ steNo: 2
+ row: 2
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 2
+ row: 2
+ # JAR4
+ 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]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 623
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 625
+ row: 1
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 1
row: 1
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
+ steNo: 1
+ row: 1
+ # JAR4
+ 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.100
- port: 120
+ ip: 10.10.10.170
+ port: 502
+ rack: 0
+ slot: 0
# ste2
ste[1]:
id: 2
- ip: 10.10.10.100
- port: 120
- # ste3
- ste[2]:
+ ip: 10.10.10.175
+ port: 502
+ rack: 0
+ slot: 0
+ # 纾呯Г
+ scale[0]:
+ id: 1
+ ip: 10.10.10.211
+ port: 5005
+ # 纾呯Г
+ scale[1]:
+ id: 2
+ ip: 10.10.10.212
+ port: 5005
+ # 纾呯Г
+ scale[2]:
id: 3
- ip: 10.10.10.100
- port: 120
- # ste4
- ste[3]:
+ ip: 10.10.10.213
+ port: 5005
+ # 纾呯Г
+ scale[3]:
id: 4
- ip: 10.10.10.100
- port: 120
\ No newline at end of file
+ ip: 10.10.10.214
+ port: 5005
\ No newline at end of file
--
Gitblit v1.9.1