From f7bcd87b19bf265d0fa157f110632d6b661ec22d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 25 九月 2023 15:25:03 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 296 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 221 insertions(+), 75 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3250e87..8db6b40 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
username: sa
password: sa@123
mvc:
@@ -23,6 +23,8 @@
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
@@ -34,7 +36,7 @@
enable: false
wms:
- url: localhost:8081/lywms
+ url: localhost:8080/hswms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -47,7 +49,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
@@ -57,21 +59,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 007
row: 3
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 008
row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.111
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
@@ -81,21 +83,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
+ staNo: 005
row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
+ staNo: 006
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.121
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
@@ -105,78 +107,250 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
+ staNo: 003
row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
+ staNo: 004
row: 10
bay: 1
lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 192.168.4.250
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 001
+ row: 15
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 002
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�5
+ crn[4]:
+ id: 5
+ ip: 192.168.4.250
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 001
+ row: 15
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 002
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�6
+ crn[5]:
+ id: 6
+ ip: 192.168.4.250
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 001
+ row: 15
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 002
+ row: 14
+ bay: 1
+ lev: 1
+
+ # RGV绌挎杞�1
+ rgv[0]:
+ id: 1
+ ip: 10.10.10.40
+ 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}
+ staNo: 103
+ # RGV绌挎杞�2
+ rgv[1]:
+ id: 2
+ ip: 192.168.4.15
+ 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}
+ staNo: 103
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 15
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
emptyInSta[0]:
- staNo: 103
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 203
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 305
+ staNo: 12
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 102
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 202
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 303
+ staNo: 11
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 103
+ staNo: 11
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}
+ # 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
+
+ # 杈撻�佺嚎
+ devp[1]:
+ id: 2
+ ip: 192.168.4.250
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 15
+ barcode: ${wcs-slave.barcode[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 12
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 11
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 11
+ barcode: ${wcs-slave.barcode[0].id}
+
# 鏉＄爜鎵弿浠�
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
@@ -185,39 +359,11 @@
ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
+ staArr: 15
# LED2
led[1]:
id: 2
ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.203
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 124
- # LED4
- led[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
+ staArr: 11
\ No newline at end of file
--
Gitblit v1.9.1