From 8037aaf2ea84786f7d2442d10b17743d6c27c89a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 24 十一月 2025 15:30:28 +0800
Subject: [PATCH] *
---
src/main/resources/application.yml | 467 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 300 insertions(+), 167 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 05f2a46..7cdd224 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,13 +8,13 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# 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
+# url: jdbc:sqlserver://localhost:1433;databasename=zzgtasrs
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=zzgtasrs
# username: sa
# password: sa@123
+ url: jdbc:sqlserver://192.168.4.191:50948;databasename=zzgtasrs
+ username: sa
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -38,8 +38,17 @@
enable: false
wms:
- url: 127.0.0.1:8081/jshdasrs
+ url: 127.0.0.1:8081/zzgtasrs
comb: mobile/combAuto/wcs/auth
+
+#License鐩稿叧閰嶇疆
+license:
+ subject: zzgtasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
inventory:
number: 7
@@ -69,7 +78,7 @@
bay: 52
lev: 1
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 2004
row: 3
bay: 52
@@ -82,7 +91,7 @@
bay: 52
lev: 1
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 2001
row: 2
bay: 52
@@ -105,7 +114,7 @@
bay: 52
lev: 1
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 2010
row: 7
bay: 52
@@ -118,7 +127,7 @@
bay: 52
lev: 1
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 2007
row: 6
bay: 52
@@ -141,17 +150,18 @@
bay: 52
lev: 1
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 2016
- row: 10
+ row: 11
bay: 52
lev: 2
crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 4001
- row: 10
+ row: 9
bay: 52
- lev: 4
+ lev: 3
+
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -160,17 +170,17 @@
bay: 52
lev: 1
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 2013
- row: 11
+ row: 9
bay: 52
lev: 2
crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 4004
row: 11
bay: 52
- lev: 4
+ lev: 3
# 鍫嗗灈鏈�4
crn[3]:
id: 4
@@ -189,7 +199,7 @@
bay: 52
lev: 1
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 2022
row: 15
bay: 52
@@ -202,8 +212,8 @@
bay: 52
lev: 1
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1022
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2019
row: 14
bay: 52
lev: 2
@@ -225,7 +235,7 @@
bay: 52
lev: 1
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 2028
row: 19
bay: 52
@@ -238,129 +248,244 @@
bay: 52
lev: 1
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ 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
+ ip: 27.172.2.70
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
- rgvOutTStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 2009
- rgvOutTStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 2015
- rgvOutTStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 2021
- rgvOutTStn[4]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 2027
- #RGV鍑哄簱鏀捐揣绔欑偣
- rgvOutPStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 2031
+ otherId: 1
+ carBodyJiaoMing: 2800
+ carBodyKunPeng: 13500
+ #RGV婧愮珯鐐�
+ rgvInSta[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1004
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: true
+ staNoOther: 1005
+ directionOther: false
+ rgvInSta[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1014
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: true
+ staNoOther: 1016
+ directionOther: true
+ rgvInSta[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1020
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: true
+ staNoOther: 1021
+ directionOther: false
+ rgvInSta[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1003
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1003
+ directionOther: false
+ rgvInSta[4]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1007
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1007
+ directionOther: false
+ rgvInSta[5]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1013
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1013
+ directionOther: false
+ rgvInSta[6]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1018
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1018
+ directionOther: false
+ rgvInSta[7]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1019
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1019
+ directionOther: false
+ #RGV鐩爣绔欑偣
+ rgvOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1002
+ direction: true
+ staNoOther: 1002
+ directionOther: false
+ rgvOutSta[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1009
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: true
+ staNoOther: 1009
+ directionOther: false
+ rgvOutSta[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1001
+ direction: false
+ staNoOther: 1001
+ directionOther: false
+ rgvOutSta[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1006
+ direction: false
+ staNoOther: 1006
+ directionOther: false
+ rgvOutSta[4]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1008
+ direction: false
+ staNoOther: 1008
+ directionOther: false
+ rgvOutSta[5]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1017
+ direction: false
+ staNoOther: 1017
+ directionOther: false
+ rgvSuperSta[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1001
+ direction: false
+ staNoOther: 1001
+ directionOther: false
+ rgvSuperSta[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1002
+ direction: false
+ staNoOther: 1002
+ directionOther: false
+ # RGV绌挎杞�2
+ rgv[0]:
+ id: 1
+ ip: 27.172.2.71
+ port: 502
+ rack: 0
+ slot: 0
+ otherId: 2
+ carBodyJiaoMing: 2800
+ carBodyKunPeng: 13500
+ #RGV婧愮珯鐐�
+ rgvInSta[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1004
+ direction: true
+ staNoOther: 1005
+ directionOther: false
+ rgvInSta[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1014
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: true
+ staNoOther: 1016
+ directionOther: true
+ rgvInSta[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1020
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: true
+ staNoOther: 1021
+ directionOther: false
+ rgvInSta[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1003
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1003
+ directionOther: false
+ rgvInSta[4]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1007
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1007
+ directionOther: false
+ rgvInSta[5]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1013
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1013
+ directionOther: false
+ rgvInSta[6]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1018
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1018
+ directionOther: false
+ rgvInSta[7]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1019
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: false
+ staNoOther: 1019
+ directionOther: false
+ #RGV鐩爣绔欑偣
+ rgvOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1023
+ direction: true
+ staNoOther: 1023
+ directionOther: false
+ rgvOutSta[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1009
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ direction: true
+ staNoOther: 1009
+ directionOther: false
+ rgvOutSta[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1022
+ direction: false
+ staNoOther: 1022
+ directionOther: false
+ rgvOutSta[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1006
+ direction: false
+ staNoOther: 1006
+ directionOther: false
+ rgvOutSta[4]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1008
+ direction: false
+ staNoOther: 1008
+ directionOther: false
+ rgvOutSta[5]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1017
+ direction: false
+ staNoOther: 1017
+ directionOther: false
+ rgvSuperSta[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1023
+ direction: false
+ staNoOther: 1023
+ directionOther: false
+ rgvSuperSta[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1022
+ direction: false
+ staNoOther: 1022
+ directionOther: false
# 杈撻�佺嚎1
devp[0]:
id: 1
@@ -441,7 +566,7 @@
inSta[1]:
staNo: 1036
barcode: ${wcs-slave.barcode[0].id}
- backSta: 1035
+ backSta: 1037
led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
@@ -473,6 +598,10 @@
staNo: 1041
led: ${wcs-slave.led[0].id}
+ outStaAgvFull[0]:
+ staNo: 1041
+ led: ${wcs-slave.led[0].id}
+
# 杈撻�佺嚎1
devp[1]:
@@ -483,7 +612,7 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 2035
+ staNo: 2037
barcode: ${wcs-slave.barcode[3].id}
backSta: 2034
led: ${wcs-slave.led[5].id}
@@ -493,18 +622,18 @@
# 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
+ pickSta[0]:
+ 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[6].id}
+ led: ${wcs-slave.led[4].id}
# # 绌烘澘鍏ュ簱鍙�1
# emptyInSta[1]:
# staNo: 107
@@ -525,11 +654,22 @@
# backSta: 108
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 2033
+ staNo: 2031
# led: ${wcs-slave.led[0].id}
outSta[1]:
staNo: 4006
- led: ${wcs-slave.led[7].id}
+ 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}
@@ -589,35 +729,28 @@
# LED4
led[3]:
id: 4
- ip: 10.10.10.215
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 152
- # LED5
- led[4]:
- id: 5
ip: 10.10.10.216
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 156
- # LED6
+ staArr: 1047
+ # LED4
+ led[4]:
+ id: 5
+ ip: 10.10.10.215
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 2037
+ # LED5
led[5]:
id: 6
ip: 10.10.10.217
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 160,159
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 4001
# LED6
led[6]:
id: 7
ip: 10.10.10.218
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 160,159
- # LED6
- led[7]:
- id: 8
- ip: 10.10.10.219
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 160,159
\ No newline at end of file
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 4006
\ No newline at end of file
--
Gitblit v1.9.1