From 8a73235a41b25c4d90fd90b0c1521f0e7d4b5368 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 30 八月 2022 09:51:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylywcs' into hylywcs
---
src/main/resources/application.yml | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a7511a2..cdd665e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -106,6 +106,12 @@
row: 6
bay: 1
lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 203
+ row: 7
+ bay: 1
+ lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
@@ -137,7 +143,37 @@
row: 10
bay: 1
lev: 1
-
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ 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: 401
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 401
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 401
+ row: 14
+ bay: 1
+ lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
@@ -157,6 +193,10 @@
inSta[2]:
staNo: 305
barcode: ${wcs-slave.barcode[2].id}
+ # 鍏ュ簱鍙�4
+ inSta[3]:
+ staNo: 401
+ barcode: ${wcs-slave.barcode[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 103
@@ -166,6 +206,9 @@
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
staNo: 305
+ # 绌烘澘鍏ュ簱鍙�4
+ emptyInSta[3]:
+ staNo: 401
# 鍑哄簱鍙�1
outSta[0]:
staNo: 102
@@ -175,18 +218,25 @@
# 鍑哄簱鍙�3
outSta[2]:
staNo: 303
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 402
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 101
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 203
+ staNo: 202
barcode: ${wcs-slave.barcode[1].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 303
barcode: ${wcs-slave.barcode[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�4
+ pickSta[3]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[3].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -198,6 +248,10 @@
port: 51236
barcode[2]:
id: 3
+ ip: 10.10.10.52
+ port: 51236
+ barcode[3]:
+ id: 4
ip: 10.10.10.52
port: 51236
# LED1
@@ -241,4 +295,11 @@
ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 305
\ No newline at end of file
+ staArr: 305
+ # LED7
+ led[6]:
+ id: 7
+ ip: 10.10.10.207
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 402
--
Gitblit v1.9.1