From c7b93cbc11eac58bab6ba6614b997a6b389232e6 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 06 九月 2022 16:57:18 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 170 +++++++++++++++++++++++++++++---------------------------
1 files changed, 89 insertions(+), 81 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 32e5a74..89039cc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=htasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=htasrs3
username: sa
password: sa@123
mvc:
@@ -33,179 +33,187 @@
swagger:
enable: false
+wms:
+ url: localhost:8081/lywms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1,4,5,8,9,12,13,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
+ ip: 10.10.10.101
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 205
- row: 2
- bay: 65
+ staNo: 103
+ row: 3
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
+ staNo: 101
row: 2
- bay: 0
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 3
- bay: 65
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
- row: 3
- bay: 0
+ staNo: 101
+ row: 2
+ bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.10.20
+ ip: 10.10.10.111
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 6
- bay: 65
+ staNo: 203
+ row: 7
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 124
+ staNo: 201
row: 6
- bay: 0
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
- row: 7
- bay: 65
+ staNo: 201
+ row: 6
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
+ staNo: 203
row: 7
- bay: 0
+ bay: 1
lev: 1
+
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.10.100
+ ip: 192.168.4.250
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 205
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 202
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 305
+ barcode: ${wcs-slave.barcode[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 205
+ staNo: 103
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 202
+ staNo: 203
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
- staNo: 126
+ staNo: 305
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 200
+ staNo: 102
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 203
+ staNo: 202
# 鍑哄簱鍙�3
outSta[2]:
- staNo: 103
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 303
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 127
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 128
+ staNo: 202
+ barcode: ${wcs-slave.barcode[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 303
+ barcode: ${wcs-slave.barcode[2].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.52
port: 51236
- # LED1
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.52
+ port: 51236
+ # LED1
led[0]:
id: 1
- ip: 192.168.10.61
+ ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109,113,103,200,203 # todo:luxiaotao
+ staArr: 102
# LED2
led[1]:
id: 2
- ip: 192.168.10.61
+ ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109,113,103,200,203 # todo:luxiaotao
+ staArr: 103
# LED3
led[2]:
- id: 2
- ip: 192.168.10.61
+ id: 3
+ ip: 10.10.10.203
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: 202
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.204
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 203
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.205
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 303
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 305
\ No newline at end of file
--
Gitblit v1.9.1