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 | 585 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 323 insertions(+), 262 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 08eff50..5104d26 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ 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=lfdasrs
+ url: jdbc:sqlserver://10.0.100.132:1433;databasename=jxgtasrs
username: sa
password: sa@123
mvc:
@@ -34,425 +34,486 @@
enable: false
wms:
- url: localhost:8081/lfdwms
+ url: 10.0.100.132:8080/gtCrnWms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 9,12,15,18
+ doubleLocs: 1,4,5,8,9,12
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.1
- port: 6000
+ 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: 105
- row: 1
- bay: 1
+ 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: 106
- row: 2
- bay: 1
+ staNo: 1029
+ row: 3
+ bay: 47
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]:
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
+ 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: 114
- row: 4
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1043
+ row: 3
bay: 1
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.3
- port: 6000
+ 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.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: 121
- row: 5
- bay: 1
+ staNo: 1021
+ row: 7
+ bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 122
+ 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
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.4
- port: 6000
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ 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.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: 129
- row: 7
- bay: 1
+ staNo: 1033
+ row: 11
+ bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 130
- row: 8
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.5
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
+ staNo: 1031
row: 10
- bay: 1
+ bay: 47
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2008
+ row: 11
+ bay: 47
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ 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: 203
+ staNo: 1048
row: 11
bay: 1
lev: 1
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 10.10.10.6
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 208
- row: 13
- bay: 1
- lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 209
- row: 14
+ staNo: 1048
+ row: 11
bay: 1
lev: 1
- # 鍫嗗灈鏈�7
- crn[6]:
- id: 7
- ip: 10.10.10.7
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ crnInStn[3]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 214
- row: 16
+ staNo: 2018
+ row: 11
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ crnOutStn[3]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 215
- row: 17
+ staNo: 2018
+ row: 11
bay: 1
- lev: 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.100
+ ip: 10.200.51.47
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ staNo: 1001
+ backSta: 1000
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
inSta[1]:
- staNo: 109
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
- led: ${wcs-slave.led[1].id}
- # 鍏ュ簱鍙�3
+ staNo: 2001
+ backSta: 2000
+ led: ${wcs-slave.led[5].id}
inSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 116
- led: ${wcs-slave.led[2].id}
+ staNo: 1002
+ backSta: 1035
+ led: ${wcs-slave.led[11].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 1001
+ backSta: 1000
led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�2
+ # 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 109
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 109
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
+ 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: 126
- led: ${wcs-slave.led[3].id}
- # 鍑哄簱鍙�2
+ staNo: 1024
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
outSta[1]:
- staNo: 134
- led: ${wcs-slave.led[4].id}
- # 鍑哄簱鍙�2
- outSta[2]:
- staNo: 100
+ 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
- # 杈撻�佺嚎2
devp[1]:
id: 2
- ip: 10.10.10.110
+ ip: 10.200.51.10
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
+ staNo: 1041
+ backSta: 1040
+ led: ${wcs-slave.led[3].id}
+ # 鍏ュ簱鍙�1
inSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 206
+ staNo: 2011
+ backSta: 2010
led: ${wcs-slave.led[7].id}
- # 鍏ュ簱鍙�3
+ # 鍏ュ簱鍙�1
inSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- backSta: 212
+ staNo: 3011
+ backSta: 3010
led: ${wcs-slave.led[9].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[5].id}
- # 绌烘澘鍏ュ簱鍙�2
+ staNo: 1041
+ backSta: 1040
+ led: ${wcs-slave.led[3].id}
+ # 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
+ staNo: 2011
+ backSta: 2010
led: ${wcs-slave.led[7].id}
- # 绌烘澘鍏ュ簱鍙�3
+ # 绌烘澘鍏ュ簱鍙�1
emptyInSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- led: ${wcs-slave.led[9].id}
+ staNo: 3011
+ backSta: 3010
+ led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
+ staNo: 1041
led: ${wcs-slave.led[5].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
+ backSta: 1040
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
+ staNo: 2011
led: ${wcs-slave.led[7].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
+ backSta: 2010
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
+ staNo: 3011
led: ${wcs-slave.led[9].id}
+ backSta: 3010
+
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 205
- led: ${wcs-slave.led[6].id}
- # 鍑哄簱鍙�2
+ staNo: 1040
+ led: ${wcs-slave.led[3].id}
outSta[1]:
- staNo: 211
- led: ${wcs-slave.led[8].id}
- # 鍑哄簱鍙�3
+ staNo: 1042
+ led: ${wcs-slave.led[4].id}
outSta[2]:
- staNo: 217
+ 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}
-
- # 鏉＄爜鎵弿浠�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
- # 鏉＄爜鎵弿浠�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
+ 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.201
+ ip: 10.10.10.101
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 015
+ staArr: 1001
# 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: 1024
# 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: 1028
# 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
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 1040,1041
# 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
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 1042
# 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
+ staArr: 2001,2000
+ # LED6
led[6]:
- id: 6
- ip: 10.10.10.202
+ id: 7
+ ip: 10.10.10.107
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED8
+ staArr: 2002
+ # LED6
led[7]:
- id: 5
- ip: 10.10.10.202
+ id: 8
+ ip: 10.10.10.108
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED9
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 2010,2011
+ # LED6
led[8]:
- id: 6
- ip: 10.10.10.202
+ id: 9
+ ip: 10.10.10.109
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED10
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 2012
+ # LED6
led[9]:
- id: 6
- ip: 10.10.10.202
+ id: 10
+ ip: 10.10.10.110
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED11
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 3010,3011
+ # LED6
led[10]:
- id: 6
- ip: 10.10.10.202
+ 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: 011
\ No newline at end of file
+ staArr: 1002
\ No newline at end of file
--
Gitblit v1.9.1