From 69d413866c7f646cc74a23d99e33787bbe53b96a Mon Sep 17 00:00:00 2001
From: pjb <1@qq.com>
Date: 星期二, 04 十一月 2025 08:23:37 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 564 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 370 insertions(+), 194 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0cdf7d1..5104d26 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9091
+ port: 8088
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=gdykasrs
+ url: jdbc:sqlserver://10.0.100.132:1433;databasename=jxgtasrs
username: sa
password: sa@123
mvc:
@@ -34,310 +34,486 @@
enable: false
wms:
- url: 127.0.0.1:8080/ykwms
+ url: 10.0.100.132:8080/gtCrnWms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8,9,12
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.200.51.180
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 123
+ staNo: 1017
+ row: 2
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2003
+ row: 3
+ bay: 47
+ lev: 2
+
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1029
+ row: 3
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2003
+ row: 3
+ bay: 47
+ lev: 2
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1043
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
- row: 2
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1043
+ row: 3
bay: 1
lev: 1
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2013
+ row: 3
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2013
+ row: 3
+ bay: 1
+ lev: 2
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3013
+ row: 3
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3013
+ row: 3
+ bay: 1
+ lev: 3
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.20
+ ip: 10.200.51.189
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 127
+ staNo: 1021
+ row: 7
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1030
+ row: 6
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2004
+ row: 6
+ bay: 47
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2004
+ row: 6
+ bay: 47
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1044
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 131
- row: 7
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1044
+ row: 6
bay: 1
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2014
+ row: 6
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2014
+ row: 6
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3014
+ row: 6
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3014
+ row: 6
+ bay: 1
+ lev: 3
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.30
+ ip: 10.200.51.200
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 135
- row: 10
- bay: 1
+ staNo: 1033
+ row: 11
+ bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 139
+ staNo: 1031
+ row: 10
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2008
+ row: 11
+ bay: 47
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2008
+ row: 11
+ bay: 47
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1048
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
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1048
+ row: 11
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
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2018
+ row: 11
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2018
+ row: 11
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3018
+ row: 11
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3018
+ row: 11
+ bay: 1
+ lev: 3
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.200.51.47
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
- led: ${wcs-slave.led[1].id}
+ staNo: 1001
+ backSta: 1000
+ led: ${wcs-slave.led[0].id}
+ inSta[1]:
+ staNo: 2001
+ backSta: 2000
+ led: ${wcs-slave.led[5].id}
+ inSta[2]:
+ staNo: 1002
+ backSta: 1035
+ led: ${wcs-slave.led[11].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ staNo: 1001
+ backSta: 1000
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 1025
+ backSta: 1000
+ led: ${wcs-slave.led[2].id}
+
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 2001
+ backSta: 2000
+ led: ${wcs-slave.led[5].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[3]:
+ staNo: 1002
+ backSta: 1035
+ led: ${wcs-slave.led[11].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 1024
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 1028
+ led: ${wcs-slave.led[2].id}
+ agvOutSta[0]:
+ staNo: 2000
+ agvOutSta[1]:
+ staNo: 2002
+ agvOutSta[2]:
+ staNo: 1028
+ pickSta[0]:
+ staNo: 2001
+ led: ${wcs-slave.led[5].id}
+ backSta: 2000
+ pickSta[1]:
+ staNo: 1001
+ led: ${wcs-slave.led[0].id}
+ backSta: 1000
+ pickSta[2]:
+ staNo: 1002
+ led: ${wcs-slave.led[11].id}
+ backSta: 1035
+
+ devp[1]:
+ id: 2
+ ip: 10.200.51.10
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 1041
+ backSta: 1040
+ led: ${wcs-slave.led[3].id}
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 2011
+ backSta: 2010
+ led: ${wcs-slave.led[7].id}
+ # 鍏ュ簱鍙�1
+ inSta[2]:
+ staNo: 3011
+ backSta: 3010
+ led: ${wcs-slave.led[9].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 1041
+ backSta: 1040
+ led: ${wcs-slave.led[3].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 2011
+ backSta: 2010
+ led: ${wcs-slave.led[7].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 3011
+ backSta: 3010
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 159
- barcode: ${wcs-slave.barcode[2].id}
+ staNo: 1041
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
+ backSta: 1040
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 2011
+ led: ${wcs-slave.led[7].id}
+ backSta: 2010
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[2]:
+ staNo: 3011
+ led: ${wcs-slave.led[9].id}
+ backSta: 3010
+
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
- led: ${wcs-slave.led[0].id}
- outSta[1]:
- staNo: 152
+ staNo: 1040
led: ${wcs-slave.led[3].id}
- outSta[2]:
- staNo: 156
+ outSta[1]:
+ staNo: 1042
led: ${wcs-slave.led[4].id}
-
- # 鏉＄爜鎵弿浠�1
- barcode[0]:
- id: 1
- ip: 10.10.10.121
- port: 51236
- # 鏉＄爜鎵弿浠�2
- barcode[1]:
- id: 2
- ip: 10.10.10.122
- port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.123
- port: 51236
+ outSta[2]:
+ staNo: 2010
+ led: ${wcs-slave.led[7].id}
+ outSta[3]:
+ staNo: 2012
+ led: ${wcs-slave.led[8].id}
+ outSta[4]:
+ staNo: 3010
+ led: ${wcs-slave.led[9].id}
+ outSta[5]:
+ staNo: 3012
+ led: ${wcs-slave.led[10].id}
+ agvOutSta[0]:
+ staNo: 1040
+ agvOutSta[1]:
+ staNo: 1042
+ agvOutSta[2]:
+ staNo: 2010
+ agvOutSta[3]:
+ staNo: 2012
+ agvOutSta[4]:
+ staNo: 3010
+ agvOutSta[5]:
+ staNo: 3012
# LED1
led[0]:
id: 1
ip: 10.10.10.101
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 1001
# LED2
led[1]:
id: 2
ip: 10.10.10.102
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 106
+ staArr: 1024
# LED3
led[2]:
id: 3
ip: 10.10.10.103
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 107
+ staArr: 1028
# LED4
led[3]:
id: 4
ip: 10.10.10.104
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 152
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 1040,1041
# LED5
led[4]:
id: 5
ip: 10.10.10.105
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 156
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 1042
# LED6
led[5]:
id: 6
ip: 10.10.10.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 160
\ No newline at end of file
+ staArr: 2001,2000
+ # LED6
+ led[6]:
+ id: 7
+ ip: 10.10.10.107
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 2002
+ # LED6
+ led[7]:
+ id: 8
+ ip: 10.10.10.108
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 2010,2011
+ # LED6
+ led[8]:
+ id: 9
+ ip: 10.10.10.109
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 2012
+ # LED6
+ led[9]:
+ id: 10
+ ip: 10.10.10.110
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 3010,3011
+ # LED6
+ led[10]:
+ id: 11
+ ip: 10.10.10.111
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 3012
+ # LED6
+ led[11]:
+ id: 12
+ ip: 10.10.10.111
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1002
\ No newline at end of file
--
Gitblit v1.9.1