From 44bddde6414f5c7565c21ef510c6c63dbc0971c3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 一月 2021 15:12:50 +0800
Subject: [PATCH] #test
---
src/main/resources/application.yml | 143 +++++++++++++++++++++++++++++++++++------------
1 files changed, 106 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0614e7b..61d34df 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,18 +1,14 @@
server:
port: 9090
servlet:
- context-path: /jswcs
+ context-path: /@pom.build.finalName@
spring:
application:
- name: gdwcs
+ 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
@@ -39,61 +35,120 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.39
- port: 5015
+ 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: 4
+ staNo: 205
row: 2
- bay: 1
+ 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: 2
- row: 1
- bay: 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.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.10.65
- port: 6000
+ ip: 192.168.10.100
+ 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.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
@@ -103,12 +158,26 @@
ip: 192.168.10.61
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1,2
+ 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
- ip: 192.168.10.152
- port: 8888
+# scale[0]:
+# id: 1
+# ip: 192.168.10.152
+# port: 8888
--
Gitblit v1.9.1