From 5bef83864c1c732c35418613daec7084df0133c2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 20:26:26 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 106 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 63b7175..162e44e 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://localhost:1433;databasename=jsasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=htasrs
username: sa
password: sa@123
mvc:
@@ -39,27 +35,84 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.6.9
- port: 102
+ ip: 192.168.0.20
+ port: 2000
rack: 0
- slot: 0
+ slot: 1
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
# 鍫嗗灈鏈哄叆搴撶珯鐐�
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: 2
+ ip: 192.168.0.10
+ port: 2000
+ rack: 0
+ slot: 1
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ 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
# 杈撻�佺嚎
@@ -87,18 +140,37 @@
id: 1
ip: 192.168.6.150
port: 51236
+ # 鏉$爜鎵弿浠�
+ barcode[1]:
+ id: 2
+ ip: 192.168.6.151
+ port: 51236
# 鍙拌溅
car[0]:
id: 1
ip: 192.168.10.150
port: 51236
# LED1
-# led[0]:
-# id: 1
-# ip: 192.168.10.61
-# port: 5005
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staArr: 1,2
+ led[0]:
+ id: 1
+ ip: 192.168.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 109,113,103,200,203 # todo:luxiaotao
+ # LED2
+ led[1]:
+ id: 2
+ ip: 192.168.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 109,113,103,200,203 # todo:luxiaotao
+ # LED3
+ led[2]:
+ id: 2
+ ip: 192.168.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 109,113,103,200,203 # todo:luxiaotao
# 纾呯О
# scale[0]:
# id: 1
--
Gitblit v1.9.1