From d6d524ed93f23071934cea58bc41bafacd32d3fe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 五月 2021 17:04:20 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 151 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 116 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 962f2eb..b9f046a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,12 +7,8 @@
application:
name: @pom.build.finalName@
datasource:
- # sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
- #username: sa
- #password: eisoft
- url: jdbc:sqlserver://192.168.2.250:1433;databasename=jsasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=htasrs
username: sa
password: sa@123
mvc:
@@ -39,80 +35,165 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.6.9
+ ip: 192.168.10.10
port: 102
rack: 0
- slot: 0
+ slot: 1
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 5
+ staNo: 205
+ row: 2
+ bay: 65
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 118
row: 2
bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
- row: 1
+ staNo: 203
+ row: 3
+ bay: 65
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 120
+ row: 3
bay: 0
lev: 1
- # 鍫嗗灈鏈�2
-# crn[1]:
-# id: 1
-# ip: 192.168.6.10
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 192.168.10.20
+ port: 102
+ rack: 0
+ slot: 1
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 6
+ bay: 65
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 124
+ row: 6
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 200
+ row: 7
+ bay: 65
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 100
+ row: 7
+ bay: 0
+ lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.6.120
+ ip: 192.168.10.100
port: 102
rack: 0
slot: 1
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 1
+ staNo: 306
barcode: ${wcs-slave.barcode[0].id}
+# # 鍏ュ簱鍙�2
+# inSta[1]:
+# staNo: 202
+# barcode: ${wcs-slave.barcode[1].id}
+ inSta[2]:
+ staNo: 110
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 1
+ staNo: 205
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 202
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 126
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 2
+ staNo: 200
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 203
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 103
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 3
+ staNo: 127
+ # 鎷ｆ枡鍏ュ簱鍙�
+ pickSta[1]:
+ staNo: 128
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.6.150
+ ip: 192.168.10.130
port: 51236
- # 鍙拌溅
- car[0]:
- id: 1
- ip: 192.168.10.150
+ # 鏉＄爜鎵弿浠�
+ barcode[1]:
+ id: 2
+ ip: 192.168.10.131
port: 51236
# LED1
led[0]:
id: 1
- ip: 192.168.10.61
+ ip: 192.168.10.211
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 2
+ staArr: 113
+ # LED2
+ led[1]:
+ id: 2
+ ip: 192.168.10.221
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 109
+ # LED3
+ led[2]:
+ id: 3
+ ip: 192.168.10.231
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 103
# 纾呯О
-# scale[0]:
-# id: 1
-# ip: 192.168.10.152
-# port: 8888
+ scale[0]:
+ id: 1
+ ip: 192.168.10.135
+ port: 2
--
Gitblit v1.9.1