From c9ad71a4c4d2e6e4d14ec7001f523caf0a04db4d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 02 一月 2021 09:29:28 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 84 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 599fc2e..25fd543 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:
@@ -29,7 +25,7 @@
# field-strategy: 0
logging:
- path: /stock/out/wcs/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -42,8 +38,8 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.39
- port: 5015
+ ip: 192.168.6.9
+ port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -51,51 +47,69 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 4
+ staNo: 5
row: 2
- bay: 1
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 2
+ staNo: 6
row: 1
- bay: 1
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 192.168.6.20
+ port: 6000
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 107
+ row: 4
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 3
+ bay: 0
lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.10.65
- port: 6000
+ ip: 192.168.6.120
+ port: 102
rack: 0
slot: 1
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 3
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 7
+ staNo: 1
barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 3
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 7
+ staNo: 1
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 1
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 5
+ staNo: 2
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 2
+ staNo: 3
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.10.150
+ ip: 192.168.6.150
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[1]:
+ id: 2
+ ip: 192.168.6.151
port: 51236
# 鍙拌溅
car[0]:
@@ -103,12 +117,12 @@
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: 2,3
# 纾呯О
# scale[0]:
# id: 1
--
Gitblit v1.9.1