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 | 487 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 393 insertions(+), 94 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3250e87..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://localhost:1433;databasename=hylyasrs
+ 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:
@@ -23,9 +24,12 @@
mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
path: /stock/out/@pom.build.finalName@/logs
+ enableEveryThreadLog: true
super:
pwd: xltys1995
@@ -34,20 +38,24 @@
enable: false
wms:
- url: localhost:8081/lywms
+ url: localhost:8080/yxwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ 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: 10.10.10.101
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -57,21 +65,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 3
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 2
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.111
+ ip: 10.10.10.130
port: 102
rack: 0
slot: 0
@@ -81,21 +91,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
+ staNo: 145
+ staNoOther: 144
+ row: 8
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
+ staNo: 148
+ staNoOther: 149
+ row: 5
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.121
+ ip: 10.10.10.140
port: 102
rack: 0
slot: 0
@@ -105,119 +117,406 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 11
+ staNo: 261
+ staNoOther: 261
+ row: 10
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
- row: 10
+ staNo: 200
+ staNoOther: 200
+ row: 9
bay: 1
lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.150
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 260
+ staNoOther: 260
+ row: 12
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 250
+ staNoOther: 250
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�5
+ crn[4]:
+ id: 5
+ ip: 10.10.10.160
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 259
+ staNoOther: 259
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 241
+ staNoOther: 241
+ row: 13
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�6
+ crn[5]:
+ id: 6
+ ip: 10.10.10.10
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 413
+ staNoOther: 413
+ row: 23
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 415
+ staNoOther: 415
+ row: 22
+ bay: 1
+ 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[1].id}
+ staNo: 407
+ staNoOther: 407
+ row: 25
+ bay: 1
+ lev: 1
+ # RGV绌挎杞�1
+ rgv[0]:
+ id: 1
+ ip: 192.168.18.77
+ port: 502
+ rack: 0
+ slot: 0
+ #RGV鍏ュ簱婧愮珯鐐�
+ rgvInSStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 100
+ rgvInSStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 101
+ #RGV鍑哄簱婧愮珯鐐�
+ rgvOutSStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 110
+ rgvOutSStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 112
+ #RGV鐩爣绔欑偣
+ rgvDestStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 102
+ rgvDestStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 103
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 103
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[2].id}
- # 绌烘澘鍏ュ簱鍙�1
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ singleSta[0]:
+ staNo: 153
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�2
+ singleSta[1]:
+ staNo: 145
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�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: 10.10.10.30
+ port: 102
+ rack: 0
+ slot: 0
+ # 绌烘澘鍏ュ簱鍙�1(涓存椂)
emptyInSta[0]:
- staNo: 103
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 203
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 305
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 102
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 202
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 303
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 103
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 303
- barcode: ${wcs-slave.barcode[2].id}
+ staNo: 511
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
ip: 10.10.10.52
port: 51236
+ # 鏉＄爜鎵弿浠�
barcode[1]:
id: 2
ip: 10.10.10.52
port: 51236
+ # 鏉＄爜鎵弿浠�
barcode[2]:
id: 3
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[4]:
+ id: 5
ip: 10.10.10.52
port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 192.168.18.5
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
- # LED2
- led[1]:
+ staArr: 144
+ # 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: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
- # 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: 10.10.10.203
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 124
- # LED4
- led[3]:
+ 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.204
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 131
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.205
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
- # LED6
- led[5]:
- id: 5
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
\ No newline at end of file
+ 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