From 2cc17d26486c9e4d4db6157497589c52dd7f0dc2 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 17 三月 2022 13:50:04 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 198 ++++++++++++++++++++++++++----------------------
1 files changed, 107 insertions(+), 91 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0b84f05..b688f73 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,11 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=htasrs
+ # 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
username: sa
password: sa@123
mvc:
@@ -33,163 +37,175 @@
swagger:
enable: false
+wms:
+ url: 10.10.10.238:8080/xgmwms
+# url: localhost:8082/xgmwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
- port: 102
- rack: 0
- slot: 1
+ ip: 10.10.10.10
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 205
+ staNo: 100
row: 2
- bay: 65
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
- row: 2
- bay: 0
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
+ staNo: 101
row: 3
- bay: 65
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
- row: 3
- bay: 0
+ bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.10.20
- port: 102
- rack: 0
- slot: 1
+ ip: 10.10.10.13
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
+ staNo: 102
row: 6
- bay: 65
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 124
- row: 6
- bay: 0
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
+ staNo: 103
row: 7
- bay: 65
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.10.10.16
+ port: 8888
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 104
+ row: 10
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
+ crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 7
- bay: 0
+ staNo: 105
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.19
+ port: 8888
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 106
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 107
+ 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: 192.168.10.100
+ ip: 10.10.10.50
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 1
+ staNo: 176
barcode: ${wcs-slave.barcode[0].id}
+ inSta[1]:
+ staNo: 180
+ barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 1
+ staNo: 176
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 2
+ staNo: 173
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 182
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 3
+ staNo: 176
+ barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.6.150
+ ip: 10.10.10.52
port: 51236
- # 鏉＄爜鎵弿浠�
barcode[1]:
id: 2
- ip: 192.168.6.151
+ ip: 10.10.10.53
port: 51236
- # 鍙拌溅
- car[0]:
- id: 1
- ip: 192.168.10.150
- port: 51236
- # LED1
+ # LED1
led[0]:
id: 1
- ip: 192.168.10.61
+ ip: 10.10.10.60
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109,113,103,200,203 # todo:luxiaotao
+ staArr: 172
# LED2
led[1]:
id: 2
- ip: 192.168.10.61
+ ip: 10.10.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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ staArr: 182
--
Gitblit v1.9.1