From 1665b765b52dde8676ac9cad783f81821586f677 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期五, 17 五月 2024 17:03:45 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 250 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 185 insertions(+), 65 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 00a51f8..b2b590b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=gdykasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8081/lywms
+ url: 127.0.0.1:9090/ykwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -47,7 +47,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.10.10.10
port: 102
rack: 0
slot: 0
@@ -57,21 +57,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 123
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 118
row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.111
+ ip: 10.10.10.20
port: 102
rack: 0
slot: 0
@@ -81,21 +81,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
+ staNo: 131
row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
+ staNo: 127
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.121
+ ip: 10.10.10.30
port: 102
rack: 0
slot: 0
@@ -105,19 +105,127 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 11
+ staNo: 135
+ row: 10
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
- row: 10
+ staNo: 139
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.40
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 144
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 148
+ row: 15
bay: 1
lev: 1
- # 杈撻�佺嚎
+ # RGV绌挎杞�1
+ rgv[0]:
+ id: 1
+ ip: 10.10.10.60
+ port: 502
+ rack: 0
+ slot: 0
+ #RGV鍏ュ簱婧愮珯鐐�
+ rgvInSStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 100
+ rgvInSStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ #RGV鍑哄簱婧愮珯鐐�
+ rgvOutSStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 110
+ rgvOutSStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 112
+ #RGV鐩爣绔欑偣
+ rgvDestStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 102
+ rgvDestStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ # RGV绌挎杞�2
+ rgv[1]:
+ id: 2
+ ip: 10.10.10.63
+ port: 502
+ rack: 0
+ slot: 0
+ #RGV鍏ュ簱婧愮珯鐐�
+ rgvInSStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 100
+ rgvInSStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ #RGV鍑哄簱婧愮珯鐐�
+ rgvOutSStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 110
+ rgvOutSStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 112
+ #RGV鐩爣绔欑偣
+ rgvDestStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 102
+ rgvDestStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ # RGV绌挎杞�2
+ rgv[2]:
+ id: 3
+ ip: 10.10.10.66
+ port: 502
+ rack: 0
+ slot: 0
+ #RGV鍏ュ簱婧愮珯鐐�
+ rgvInSStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 100
+ rgvInSStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ #RGV鍑哄簱婧愮珯鐐�
+ rgvOutSStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 110
+ rgvOutSStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 112
+ #RGV鐩爣绔欑偣
+ rgvDestStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 102
+ rgvDestStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ # 杈撻�佺嚎1
devp[0]:
id: 1
ip: 10.10.10.50
@@ -126,98 +234,110 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 106
barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[2].id}
+ backSta: 105
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 203
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 305
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 102
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 202
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 303
+ staNo: 106
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 105
+ led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 103
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 305
+ staNo: 159
barcode: ${wcs-slave.barcode[2].id}
- # 鏉＄爜鎵弿浠�
+ led: ${wcs-slave.led[5].id}
+ backSta: 160
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 108
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 108
+ led: ${wcs-slave.led[2].id}
+ inSta[2]:
+ staNo: 159
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 160
+ led: ${wcs-slave.led[5].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[1]:
+# staNo: 107
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# backSta: 108
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 100
+ led: ${wcs-slave.led[0].id}
+ outSta[1]:
+ staNo: 152
+ led: ${wcs-slave.led[3].id}
+ outSta[2]:
+ staNo: 156
+ led: ${wcs-slave.led[4].id}
+
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.121
port: 51236
+ # 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.52
+ ip: 10.10.10.122
port: 51236
+ # 鏉＄爜鎵弿浠�3
barcode[2]:
id: 3
- ip: 10.10.10.52
+ ip: 10.10.10.123
port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.101
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.102
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
+ staArr: 106
# LED3
led[2]:
id: 3
- ip: 10.10.10.203
+ ip: 10.10.10.103
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 202
+ staArr: 107
# LED4
led[3]:
id: 4
- ip: 10.10.10.204
+ ip: 10.10.10.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 203
+ staArr: 152
# LED5
led[4]:
id: 5
- ip: 10.10.10.205
+ ip: 10.10.10.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 303
+ staArr: 156
# LED6
led[5]:
id: 6
- ip: 10.10.10.206
+ ip: 10.10.10.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 305
\ No newline at end of file
+ staArr: 160,159
\ No newline at end of file
--
Gitblit v1.9.1