From b6fc07bc9d9af60511d171c2147b806bb7dd6983 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 08:43:50 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 591 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 493 insertions(+), 98 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8f43631..49f5811 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,13 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=sxlktasrs
+# url: jdbc:sqlserver://localhost:1433;databasename=jshdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
username: sa
password: sa@123
+# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
+# username: sa
+# password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -34,20 +38,23 @@
enable: false
wms:
- url: 127.0.0.1:8080/lktwms
+ url: 127.0.0.1:8081/jshdasrs
+ comb: mobile/combAuto/wcs/auth
+inventory:
+ number: 7
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,11,14,21,24
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
@@ -57,21 +64,33 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 1001
row: 2
- bay: 1
+ bay: 52
lev: 1
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2004
+ row: 3
+ bay: 52
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
+ staNo: 1005
row: 3
- bay: 1
+ bay: 52
lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2001
+ row: 2
+ bay: 52
+ lev: 2
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.4.250
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
@@ -80,22 +99,34 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
- row: 12
- bay: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1011
+ row: 7
+ bay: 52
lev: 1
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2010
+ row: 7
+ bay: 52
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 204
- row: 13
- bay: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1008
+ row: 6
+ bay: 52
lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2007
+ row: 6
+ bay: 52
+ lev: 2
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.4.250
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -104,104 +135,439 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[2].id}
- staNo: 303
- row: 22
- bay: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1015
+ row: 9
+ bay: 52
lev: 1
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2016
+ row: 11
+ bay: 52
+ lev: 2
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 4001
+ row: 9
+ bay: 52
+ lev: 3
+
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[2].id}
- staNo: 304
- row: 23
- bay: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1019
+ row: 11
+ bay: 52
lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2013
+ row: 9
+ bay: 52
+ lev: 2
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 4004
+ row: 11
+ bay: 52
+ lev: 3
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.130
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1025
+ row: 15
+ bay: 52
+ lev: 1
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2022
+ row: 15
+ bay: 52
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1022
+ row: 14
+ bay: 52
+ lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2019
+ row: 14
+ bay: 52
+ lev: 2
+ # 鍫嗗灈鏈�4
+ crn[4]:
+ id: 5
+ ip: 10.10.10.140
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1032
+ row: 19
+ bay: 52
+ lev: 1
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2028
+ row: 19
+ bay: 52
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1029
+ row: 18
+ bay: 52
+ lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2025
+ row: 18
+ bay: 52
+ lev: 2
+
+ # RGV绌挎杞�1
+ rgv[0]:
+ id: 1
+ ip: 10.10.10.190
+ port: 502
+ rack: 0
+ slot: 0
+ #RGV鍏ュ簱鍙栬揣绔欑偣
+ rgvInTStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1042
+ staNo2: 1043
+ rgvInTStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1105
+ staNo2: 1104
+ rgvInTStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1038
+ rgvInTStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1036
+ #RGV鍏ュ簱鏀捐揣绔欑偣
+ rgvInPStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1004
+ rgvInPStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1014
+ rgvInPStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1018
+ rgvInPStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1028
+ rgvInPStn[4]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1035
+ #RGV鍑哄簱鍙栬揣绔欑偣
+ rgvOutTStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1007
+ staNo2: 1005
+ rgvOutTStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1010
+ staNo2: 1008
+ rgvOutTStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1021
+ staNo2: 1019
+ rgvOutTStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1024
+ staNo2: 1022
+ rgvOutTStn[4]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1031
+ staNo2: 1029
+ #RGV鍑哄簱鏀捐揣绔欑偣
+ rgvOutPStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1106
+ rgvOutPStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1041
+ rgvOutPStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1036
+
+ # RGV绌挎杞�2
+ rgv[1]:
+ id: 2
+ ip: 10.10.10.193
+ port: 502
+ rack: 0
+ slot: 0
+ #RGV鍏ュ簱鍙栬揣绔欑偣
+ rgvInTStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2037
+ #RGV鍏ュ簱鏀捐揣绔欑偣
+ rgvInPStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2006
+ rgvInPStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2012
+ rgvInPStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2018
+ rgvInPStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2024
+ rgvInPStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2030
+ #RGV鍑哄簱鍙栬揣绔欑偣
+ rgvOutTStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2003
+ staNo2: 2001
+ rgvOutTStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2009
+ staNo2: 2007
+
+ rgvOutTStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2015
+ staNo2: 2013
+
+ rgvOutTStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2021
+ staNo2: 2019
+
+ rgvOutTStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2027
+ staNo2: 2025
+
+ #RGV鍑哄簱鏀捐揣绔欑偣
+ rgvOutPStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2031
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.51
port: 102
rack: 0
slot: 0
+ # 鐮佸灈浣�
+ armSta[0]:
+ staNo: 1098
+ armNo: 1
+ sortingLine: 8
+ staNoEnd: 1103
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
+ # 鐮佸灈浣�
+ armSta[1]:
+ staNo: 1093
+ armNo: 1
+ sortingLine: 7
+ staNoEnd: 1093
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
+ # 鐮佸灈浣�
+ armSta[2]:
+ staNo: 1087
+ armNo: 2
+ sortingLine: 6
+ staNoEnd: 1087
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
+ # 鐮佸灈浣�
+ armSta[3]:
+ staNo: 1082
+ armNo: 2
+ sortingLine: 5
+ staNoEnd: 1082
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
+ # 鐮佸灈浣�
+ armSta[4]:
+ staNo: 1074
+ armNo: 3
+ sortingLine: 4
+ staNoEnd: 1074
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
+ # 鐮佸灈浣�
+ armSta[5]:
+ staNo: 1071
+ armNo: 3
+ sortingLine: 3
+ staNoEnd: 1071
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
+ # 鐮佸灈浣�
+ armSta[6]:
+ staNo: 1061
+ armNo: 4
+ sortingLine: 2
+ staNoEnd: 1061
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
+ # 鐮佸灈浣�
+ armSta[7]:
+ staNo: 1058
+ armNo: 4
+ sortingLine: 1
+ staNoEnd: 1058
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 1047
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1041
+ led: ${wcs-slave.led[1].id}
+ inSta[1]:
+ staNo: 1036
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 1037
led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 1038
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 1038
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 101
+ staNo: 1036
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
+ backSta: 1037
+ # 鍏ュ簱鍙�1
+ inSta[2]:
+ staNo: 1103
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 1041
+ led: ${wcs-slave.led[2].id}
+# inSta[2]:
+# staNo: 159
+# barcode: ${wcs-slave.barcode[2].id}
+# barcodeMat: ${wcs-slave.barcode[5].id}
+# backSta: 160
+# led: ${wcs-slave.led[5].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 106
+ staNo: 1041
+ led: ${wcs-slave.led[1].id}
+ outStaAgvFull[0]:
+ staNo: 1041
+ led: ${wcs-slave.led[1].id}
+ inStaAgv[0]:
+ staNo: 1037
led: ${wcs-slave.led[0].id}
- # 杈撻�佺嚎2
+
+ # 杈撻�佺嚎1
devp[1]:
id: 2
- ip: 192.168.4.250
+ ip: 10.10.10.71
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[3].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[3].id}
+ staNo: 2037
+ barcode: ${wcs-slave.barcode[3].id}
+ backSta: 2034
+ led: ${wcs-slave.led[5].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 106
+# barcode: ${wcs-slave.barcode[0].id}
+# backSta: 105
+# led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[3].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 206
- led: ${wcs-slave.led[2].id}
-
- # 杈撻�佺嚎3
- devp[2]:
- id: 3
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 300
- led: ${wcs-slave.led[5].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 200
- led: ${wcs-slave.led[5].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[5].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 306
+ staNo: 4001
+ barcode: ${wcs-slave.barcode[4].id}
led: ${wcs-slave.led[4].id}
+ backSta: 4003
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 4001
+ barcode: ${wcs-slave.barcode[4].id}
+ backSta: 4003
+ led: ${wcs-slave.led[4].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}
+# barcodeMat: ${wcs-slave.barcode[5].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: 2031
+# led: ${wcs-slave.led[0].id}
+ outSta[1]:
+ staNo: 4006
+ led: ${wcs-slave.led[5].id}
+
+ # 鍏ュ簱鍙�1
+ inStaAgv[0]:
+ staNo: 2034
+ led: ${wcs-slave.led[5].id}
+ outStaAgvEmpty[0]:
+ staNo: 2033
+ led: ${wcs-slave.led[5].id}
+ outStaAgvFull[0]:
+ staNo: 4006
+ led: ${wcs-slave.led[5].id}
+# outSta[2]:
+# staNo: 156
+# led: ${wcs-slave.led[4].id}
+ # 鎷嗗灈浣�
+ armStaTwo[0]:
+ staNo: 2110
+ armNo: 5
+ # 鎷嗗灈浣�
+ armStaTwo[1]:
+ staNo: 2120
+ armNo: 6
+
# 鏉＄爜鎵弿浠�1
barcode[0]:
@@ -218,45 +584,74 @@
id: 3
ip: 10.10.10.123
port: 51236
+ # 鏉＄爜鎵弿浠�1mat
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.124
+ port: 51236
+ # 鏉＄爜鎵弿浠�2mat
+ barcode[4]:
+ id: 5
+ ip: 10.10.10.125
+ port: 51236
+ # 鏉＄爜鎵弿浠�3mat
+ barcode[5]:
+ id: 6
+ ip: 10.10.10.126
+ port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.249
+ ip: 10.10.10.212
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
+ staArr: 1036
# LED2
led[1]:
id: 2
- ip: 10.10.10.248
+ ip: 10.10.10.213
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 108
+ staArr: 1041
# LED3
led[2]:
id: 3
- ip: 10.10.10.247
+ ip: 10.10.10.214
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
+ staArr: 1103
# LED4
led[3]:
id: 4
- ip: 10.10.10.246
+ ip: 10.10.10.216
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 126
- # LED5
+ staArr: 1047
+ # LED4
led[4]:
id: 5
- ip: 10.10.10.245
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 134
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.244
+ ip: 10.10.10.215
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 201
\ No newline at end of file
+ staArr: 2037
+ # LED5
+ led[5]:
+ id: 6
+ ip: 10.10.10.217
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 4001
+ # LED6
+ led[6]:
+ id: 7
+ ip: 10.10.10.218
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 4006
+ # LED7
+ led[7]:
+ id: 8
+ ip: 10.10.10.219
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1041
\ No newline at end of file
--
Gitblit v1.9.1