From 8d8cbcc2d2325b972488ce47e993dfb538c8ba70 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 21 六月 2024 15:00:45 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 546 ++++++++++++++++++++++++++++-------------------------
1 files changed, 289 insertions(+), 257 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7da3fae..055947f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
+ url: jdbc:sqlserver://10.10.10.254:1433;databasename=ahyxasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
username: sa
password: sa@123
mvc:
@@ -28,6 +29,7 @@
logging:
path: /stock/out/@pom.build.finalName@/logs
+ enableEveryThreadLog: true
super:
pwd: xltys1995
@@ -36,20 +38,24 @@
enable: false
wms:
- url: localhost:8080/hswms
+ url: localhost:8080/yxwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
+ doubleLocs: 1,4,5,8,21,24,27
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
+ # 宸︽繁搴撲綅鎺掑彿
+ doubleLocsLeft: 1,5,21
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 4,8,24,27
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.18.13
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -59,35 +65,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 3
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 201
- row: 3
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 100
- row: 2
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 200
- row: 2
- bay: 1
- lev: 2
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.18.21
+ ip: 10.10.10.130
port: 102
rack: 0
slot: 0
@@ -97,35 +91,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 7
+ staNo: 145
+ staNoOther: 144
+ row: 8
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
- row: 7
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 6
+ staNo: 148
+ staNoOther: 149
+ row: 5
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.18.29
+ ip: 10.10.10.140
port: 102
rack: 0
slot: 0
@@ -135,35 +117,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 11
+ staNo: 261
+ staNoOther: 261
+ row: 10
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
- row: 11
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 10
+ staNo: 200
+ staNoOther: 200
+ row: 9
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 204
- row: 10
- bay: 1
- lev: 2
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 192.168.18.37
+ ip: 10.10.10.150
port: 102
rack: 0
slot: 0
@@ -173,35 +143,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 111
- row: 15
+ staNo: 260
+ staNoOther: 260
+ row: 12
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 207
- row: 15
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 14
+ staNo: 250
+ staNoOther: 250
+ row: 11
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 206
- row: 14
- bay: 1
- lev: 2
# 鍫嗗灈鏈�5
crn[4]:
id: 5
- ip: 192.168.18.45
+ ip: 10.10.10.160
port: 102
rack: 0
slot: 0
@@ -211,35 +169,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 19
+ staNo: 259
+ staNoOther: 259
+ row: 14
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 209
- row: 19
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- row: 18
+ staNo: 241
+ staNoOther: 241
+ row: 13
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 208
- row: 18
- bay: 1
- lev: 2
# 鍫嗗灈鏈�6
crn[5]:
id: 6
- ip: 192.168.18.53
+ ip: 10.10.10.10
port: 102
rack: 0
slot: 0
@@ -248,33 +194,46 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 117
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 413
+ staNoOther: 413
row: 23
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 211
- row: 23
+ staNo: 415
+ staNoOther: 415
+ row: 22
bay: 1
- lev: 2
+ lev: 1
+ # 鍫嗗灈鏈�7
+ crn[6]:
+ id: 7
+ ip: 10.10.10.20
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 405
+ staNoOther: 405
+ row: 26
+ bay: 1
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 115
- row: 22
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 407
+ staNoOther: 407
+ row: 25
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 210
- row: 22
- bay: 1
- lev: 2
-
# RGV绌挎杞�1
rgv[0]:
id: 1
@@ -284,163 +243,70 @@
slot: 0
#RGV鍏ュ簱婧愮珯鐐�
rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 100
rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 101
#RGV鍑哄簱婧愮珯鐐�
rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 110
rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 112
#RGV鐩爣绔欑偣
rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 102
rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- # RGV绌挎杞�2
- rgv[1]:
- id: 2
- ip: 192.168.18.79
- 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}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 103
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.18.71
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 122
- # WMS鍏ュ簱鍙�1
- inWmsSta[0]:
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ singleSta[0]:
+ staNo: 153
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�2
+ singleSta[1]:
staNo: 145
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 122
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 122
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[0]:
- staNo: 118
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[1]:
- staNo: 119
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[2]:
- staNo: 120
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[3]:
- staNo: 121
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 122
- # Rgv鍑哄簱鍙�1
- outRgvSta[0]:
- staNo: 102
- # Rgv鍑哄簱鍙�1
- outRgvSta[1]:
- staNo: 105
- # Rgv鍑哄簱鍙�1
- outRgvSta[2]:
- staNo: 108
- # Rgv鍑哄簱鍙�1
- outRgvSta[3]:
- staNo: 111
- # Rgv鍑哄簱鍙�1
- outRgvSta[4]:
- staNo: 114
- # Rgv鍑哄簱鍙�1
- outRgvSta[5]:
- staNo: 117
- # Rgv鍏ュ簱鍙�1
- inRgvSta[0]:
- staNo: 118
- # Rgv鍏ュ簱鍙�1
- inRgvSta[1]:
- staNo: 119
- # Rgv鍏ュ簱鍙�1
- inRgvSta[2]:
- staNo: 120
- # Rgv鍏ュ簱鍙�1
- inRgvSta[3]:
- staNo: 121
- # Rgv鍏ュ簱鍙�1
- inRgvSta[4]:
- staNo: 122
- # Rgv鍏ュ簱鍙�1
- inRgvSta[5]:
- staNo: 123
-
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inSingleSta[0]:
+ staNo: 174
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+ emptyInSingleSta[0]:
+ staNo: 104
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+ emptyInSingleSta[1]:
+ staNo: 173
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inLargeSta[0]:
+ staNo: 292
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inLargeSta[1]:
+ staNo: 281
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+ emptyInLargeSta[0]:
+ staNo: 292
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
+ emptyInLargeSta[1]:
+ staNo: 281
# 杈撻�佺嚎
devp[1]:
id: 2
- ip: 192.168.18.81
+ ip: 10.10.10.30
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 217
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 221
- barcode: ${wcs-slave.barcode[1].id}
- # WMS鍏ュ簱鍙�1
- inWmsSta[0]:
- staNo: 212
- # 绌烘澘鍏ュ簱鍙�1
+ # 绌烘澘鍏ュ簱鍙�1(涓存椂)
emptyInSta[0]:
- staNo: 212
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 212
- # 鍑哄簱鍙�1
- outSta[1]:
- staNo: 213
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 212
- # 2妤肩爜鍨涗綅缃�
- driveSta[0]:
- staNo: 215
- barcode: ${wcs-slave.barcode[3].id}
- # 2妤肩爜鍨涗綅缃�
- driveSta[1]:
- staNo: 219
- barcode: ${wcs-slave.barcode[4].id}
+ staNo: 511
# 鏉＄爜鎵弿浠�
barcode[0]:
@@ -474,17 +340,183 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 144
- # LED2
- led[1]:
+ # JAR1
+ jar[0]:
+ id: 1
+ ip: 10.10.10.190
+ port: 120
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 101
+ row: 1
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 102
+ row: 1
+ # 纭寲缃愬嚭搴撶珯鐐�
+ jarOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 102
+ row: 1
+ # 纭寲缃愬叆搴揜GV
+ jarInRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 173
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 173
+ row: 2
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 173
+ row: 1
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 173
+ row: 2
+ # JAR2
+ jar[1]:
id: 2
- ip: 192.168.18.6
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 217
- # LED3
- led[2]:
+ ip: 10.10.10.191
+ port: 120
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 101
+ row: 1
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 102
+ row: 1
+ # 纭寲缃愬嚭搴撶珯鐐�
+ jarOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 202
+ row: 1
+ # 纭寲缃愬叆搴揜GV
+ jarInRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 173
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 173
+ row: 2
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 173
+ row: 1
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 173
+ row: 2
+ # JAR3
+ jar[2]:
id: 3
- ip: 192.168.18.7
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 221
\ No newline at end of file
+ ip: 10.10.10.192
+ port: 120
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 101
+ row: 1
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 102
+ row: 1
+ # 纭寲缃愬嚭搴撶珯鐐�
+ jarOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 102
+ row: 1
+ # 纭寲缃愬叆搴揜GV
+ jarInRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 173
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 173
+ row: 2
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 173
+ row: 1
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 173
+ row: 2
+ # JAR4
+ jar[3]:
+ id: 4
+ ip: 10.10.10.193
+ port: 120
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 101
+ row: 1
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 102
+ row: 1
+ # 纭寲缃愬嚭搴撶珯鐐�
+ jarOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 102
+ row: 1
+ # 纭寲缃愬叆搴揜GV
+ jarInRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 173
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 173
+ row: 2
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 173
+ row: 1
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 173
+ row: 2
+ # ste1
+ ste[0]:
+ id: 1
+ ip: 10.10.10.100
+ port: 120
+ # ste2
+ ste[1]:
+ id: 2
+ ip: 10.10.10.100
+ port: 120
+ # ste3
+ ste[2]:
+ id: 3
+ ip: 10.10.10.100
+ port: 120
+ # ste4
+ ste[3]:
+ id: 4
+ ip: 10.10.10.100
+ port: 120
\ No newline at end of file
--
Gitblit v1.9.1