From 480644e9b989821d9a039c654acb11cda19b5ccd Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 20 九月 2022 16:55:19 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 108 ++++++++++++++++++++----------------------------------
1 files changed, 40 insertions(+), 68 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e2b441a..f8ab093 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,11 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
- # username: sa
- # password: Zoneyung@zy56$
-# url: jdbc:sqlserver://10.10.10.238:1433;databasename=xgmasrs
- url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs
username: sa
password: sa@123
mvc:
@@ -38,174 +34,150 @@
enable: false
wms:
- url: 10.10.10.238:8080/xgmwms
-# url: localhost:8082/xgmwms
+ url: localhost:8080/stwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
+ doubleLocs: 1,4,5,8,9,12,13
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
+ ip: 10.10.10.101
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
+ staNo: 001
row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 002
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.13
- port: 8888
+ ip: 10.10.10.111
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
+ staNo: 003
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 004
row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.16
- port: 8888
+ ip: 10.10.10.121
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
+ staNo: 005
row: 10
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
+ staNo: 006
row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 10.10.10.19
- port: 8888
+ ip: 10.10.10.121
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
+ staNo: 007
row: 14
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
+ staNo: 008
row: 15
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.22
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 18
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 19
bay: 1
lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 015
barcode: ${wcs-slave.barcode[0].id}
- inSta[1]:
- staNo: 180
- barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 012
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 173
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 182
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 011
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 176
+ staNo: 011
barcode: ${wcs-slave.barcode[0].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
ip: 10.10.10.52
port: 51236
- barcode[1]:
- id: 2
- ip: 10.10.10.53
- port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 172
+ staArr: 015
# LED2
led[1]:
id: 2
- ip: 10.10.10.61
+ ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
+ staArr: 011
\ No newline at end of file
--
Gitblit v1.9.1