From 69d413866c7f646cc74a23d99e33787bbe53b96a Mon Sep 17 00:00:00 2001
From: pjb <1@qq.com>
Date: 星期二, 04 十一月 2025 08:23:37 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 154 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 115 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 388f6db..5104d26 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,7 +41,7 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1,4,5,8,9,12
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -52,7 +52,7 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
@@ -130,7 +130,7 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
@@ -205,7 +205,7 @@
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.200.51.189
+ ip: 10.200.51.200
port: 102
rack: 0
slot: 0
@@ -214,32 +214,74 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1033
row: 11
bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1031
row: 10
bay: 47
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 2008
row: 11
bay: 47
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 2008
- row: 10
+ row: 11
bay: 47
lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1048
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1048
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2018
+ row: 11
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2018
+ row: 11
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3018
+ row: 11
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3018
+ row: 11
+ bay: 1
+ lev: 3
# 杈撻�佺嚎1
devp[0]:
id: 1
@@ -251,32 +293,62 @@
inSta[0]:
staNo: 1001
backSta: 1000
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
inSta[1]:
staNo: 2001
backSta: 2000
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[5].id}
+ inSta[2]:
+ staNo: 1002
+ backSta: 1035
+ led: ${wcs-slave.led[11].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 1001
backSta: 1000
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
staNo: 1025
backSta: 1000
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[2]:
staNo: 2001
- backSta: 200
- led: ${wcs-slave.led[1].id}
+ backSta: 2000
+ led: ${wcs-slave.led[5].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[3]:
+ staNo: 1002
+ backSta: 1035
+ led: ${wcs-slave.led[11].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 124
+ staNo: 1024
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 1028
+ led: ${wcs-slave.led[2].id}
+ agvOutSta[0]:
+ staNo: 2000
+ agvOutSta[1]:
+ staNo: 2002
+ agvOutSta[2]:
+ staNo: 1028
+ pickSta[0]:
+ staNo: 2001
+ led: ${wcs-slave.led[5].id}
+ backSta: 2000
+ pickSta[1]:
+ staNo: 1001
led: ${wcs-slave.led[0].id}
-
+ backSta: 1000
+ pickSta[2]:
+ staNo: 1002
+ led: ${wcs-slave.led[11].id}
+ backSta: 1035
devp[1]:
id: 2
@@ -288,27 +360,27 @@
inSta[0]:
staNo: 1041
backSta: 1040
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 2011
backSta: 2010
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[7].id}
# 鍏ュ簱鍙�1
inSta[2]:
staNo: 3011
backSta: 3010
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[9].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 1041
backSta: 1040
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
staNo: 2011
backSta: 2010
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[7].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[2]:
staNo: 3011
@@ -322,32 +394,33 @@
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[1]:
staNo: 2011
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[7].id}
backSta: 2010
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[2]:
staNo: 3011
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[9].id}
backSta: 3010
+
# 鍑哄簱鍙�1
outSta[0]:
staNo: 1040
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[3].id}
outSta[1]:
staNo: 1042
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[4].id}
outSta[2]:
staNo: 2010
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[7].id}
outSta[3]:
staNo: 2012
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[8].id}
outSta[4]:
staNo: 3010
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[9].id}
outSta[5]:
staNo: 3012
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[10].id}
agvOutSta[0]:
staNo: 1040
agvOutSta[1]:
@@ -360,10 +433,6 @@
staNo: 3010
agvOutSta[5]:
staNo: 3012
- agvOutSta[6]:
- staNo: 2000
- agvOutSta[7]:
- staNo: 2012
# LED1
led[0]:
id: 1
@@ -391,7 +460,7 @@
ip: 10.10.10.104
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 1040
+ staArr: 1040,1041
# LED5
led[4]:
id: 5
@@ -405,7 +474,7 @@
ip: 10.10.10.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 2001
+ staArr: 2001,2000
# LED6
led[6]:
id: 7
@@ -419,7 +488,7 @@
ip: 10.10.10.108
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 2011
+ staArr: 2010,2011
# LED6
led[8]:
id: 9
@@ -433,11 +502,18 @@
ip: 10.10.10.110
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 3011
+ staArr: 3010,3011
# LED6
led[10]:
id: 11
ip: 10.10.10.111
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 3012
\ No newline at end of file
+ staArr: 3012
+ # LED6
+ led[11]:
+ id: 12
+ ip: 10.10.10.111
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1002
\ No newline at end of file
--
Gitblit v1.9.1