From a1b2d866d146a3c4b7559c02c678977638178b9c Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 17 五月 2024 16:27:53 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 432 ++++++++++++++++++++---------------------------------
1 files changed, 166 insertions(+), 266 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d088790..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=lfdasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=gdykasrs
username: sa
password: sa@123
mvc:
@@ -34,21 +34,21 @@
enable: false
wms:
- url: localhost:8081/lfdwms
+ url: 127.0.0.1:9090/ykwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 9,12,15,18
+ doubleLocs: 1,4,5,8,9,12,13,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.1
- port: 6000
+ ip: 10.10.10.10
+ port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -57,46 +57,22 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.2
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
+ staNo: 123
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 4
+ staNo: 118
+ row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.3
- port: 6000
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 10.10.10.20
+ port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -105,45 +81,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 121
- row: 5
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 122
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.4
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 129
+ staNo: 131
row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 130
- row: 8
+ staNo: 127
+ row: 6
bay: 1
lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.111
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.10.10.30
port: 102
rack: 0
slot: 0
@@ -152,22 +104,22 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 135
row: 10
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 139
row: 11
bay: 1
lev: 1
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 10.10.10.111
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.40
port: 102
rack: 0
slot: 0
@@ -176,163 +128,161 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 208
- row: 13
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 209
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 144
row: 14
bay: 1
lev: 1
- # 鍫嗗灈鏈�7
- crn[6]:
- id: 7
- ip: 10.10.10.111
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 214
- row: 16
- bay: 1
- lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 215
- row: 17
+ 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.100
+ ip: 10.10.10.50
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 106
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
+ backSta: 105
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 106
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 105
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 159
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 160
+ # 鍏ュ簱鍙�1
inSta[1]:
- staNo: 109
+ staNo: 107
barcode: ${wcs-slave.barcode[1].id}
backSta: 108
- led: ${wcs-slave.led[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 116
led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 109
+ staNo: 107
barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].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: 126
- led: ${wcs-slave.led[3].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 134
- led: ${wcs-slave.led[4].id}
- # 鍑哄簱鍙�2
- outSta[2]:
staNo: 100
led: ${wcs-slave.led[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 126
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 134
-# barcode: ${wcs-slave.barcode[0].id}
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.110
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- backSta: 200
- led: ${wcs-slave.led[5].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 206
- led: ${wcs-slave.led[7].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- backSta: 212
- led: ${wcs-slave.led[9].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[5].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[7].id}
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- led: ${wcs-slave.led[9].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 205
- led: ${wcs-slave.led[6].id}
- # 鍑哄簱鍙�2
outSta[1]:
- staNo: 211
- led: ${wcs-slave.led[8].id}
- # 鍑哄簱鍙�3
+ staNo: 152
+ led: ${wcs-slave.led[3].id}
outSta[2]:
- staNo: 217
- led: ${wcs-slave.led[10].id}
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
+ staNo: 156
+ led: ${wcs-slave.led[4].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
@@ -349,95 +299,45 @@
id: 3
ip: 10.10.10.123
port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.124
- port: 51236
- # 鏉＄爜鎵弿浠�5
- barcode[4]:
- id: 5
- ip: 10.10.10.125
- port: 51236
- # 鏉＄爜鎵弿浠�6
- barcode[5]:
- id: 6
- ip: 10.10.10.126
- 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: 015
+ 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: 011
+ staArr: 106
# LED3
led[2]:
id: 3
- ip: 10.10.10.202
+ ip: 10.10.10.103
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 107
# LED4
led[3]:
id: 4
- ip: 10.10.10.202
+ ip: 10.10.10.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 152
# LED5
led[4]:
id: 5
- ip: 10.10.10.202
+ ip: 10.10.10.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 156
# LED6
led[5]:
id: 6
- ip: 10.10.10.202
+ ip: 10.10.10.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED7
- led[6]:
- id: 6
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED8
- led[7]:
- id: 5
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED9
- led[8]:
- id: 6
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED10
- led[9]:
- id: 6
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED11
- led[10]:
- id: 6
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
\ No newline at end of file
+ staArr: 160,159
\ No newline at end of file
--
Gitblit v1.9.1