From cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 30 十二月 2020 10:55:09 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 131 ++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 57 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3c300fe..dd5a80d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,18 +1,18 @@
server:
port: 9090
servlet:
- context-path: /gdwcs
+ 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=gdasrs
+ url: jdbc:sqlserver://192.168.2.250:1433;databasename=jsasrs
username: sa
password: sa@123
mvc:
@@ -29,7 +29,7 @@
# field-strategy: 0
logging:
- path: /stock/out/wcs/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -42,8 +42,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,72 +51,92 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 4
+ staNo: 5
row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 2
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 192.168.10.40
- port: 5016
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=0
- offset: 2
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 8
- row: 4
- bay: 1
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 6
+ row: 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[1].id}
+ staNo: 107
+ row: 4
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 101
row: 3
- bay: 1
+ bay: 0
lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.10.65
+ ip: 192.168.6.120
+ port: 102
+ rack: 0
+ slot: 1
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 1
+ barcode: ${wcs-slave.barcode[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 1
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 2
+ # 鎷ｆ枡鍏ュ簱鍙�
+ pickSta[0]:
+ staNo: 3
+ # 杈撻�佺嚎
+ devp[1]:
+ id: 2
+ ip: 192.168.6.21
port: 6000
rack: 0
slot: 1
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 3
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 7
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 105
+ barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 3
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 7
+ staNo: 104
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 1
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 5
+ staNo: 104
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 2
+ staNo: 105
# 鏉＄爜鎵弿浠�
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
@@ -125,16 +145,13 @@
id: 1
ip: 192.168.10.61
port: 5005
- # LED2
- led[1]:
- id: 2
- ip: 192.168.10.62
- port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 2,3
# 纾呯О
- 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