From d8f89e5ce0326213f143a67d482c48a289d0b35a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 20 十月 2025 14:29:46 +0800
Subject: [PATCH] 修复堆垛机线程堆垛机号为空
---
src/main/resources/application.yml | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 68edfc1..9282531 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -48,7 +48,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.1
+ ip: 192.168.5.10
port: 102
rack: 0
slot: 0
@@ -58,21 +58,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 104
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 102
row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.10
+ ip: 192.168.5.20
port: 102
rack: 0
slot: 0
@@ -82,14 +82,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
+ staNo: 106
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
+ staNo: 108
row: 7
bay: 1
lev: 1
@@ -97,78 +97,95 @@
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.18
+ ip: 192.168.5.40
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
+ backSta: 103
led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 105
+ staNo: 106
barcode: ${wcs-slave.barcode[1].id}
- backSta: 104
+ backSta: 105
led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
+ backSta: 103
led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 105
+ staNo: 106
barcode: ${wcs-slave.barcode[1].id}
- backSta: 104
+ backSta: 105
+ led: ${wcs-slave.led[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 106
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 105
led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
+ staNo: 101
led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 106
+ staNo: 107
led: ${wcs-slave.led[3].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.121
+ ip: 192.168.5.42
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 192.168.5.43
port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.190
+ ip: 192.168.5.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 101
+ crnId: 1
# LED2
led[1]:
id: 2
- ip: 10.10.10.191
+ ip: 192.168.5.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102,103
+ staArr: 104
+ crnId: 1
# LED3
led[2]:
id: 3
- ip: 10.10.10.192
+ ip: 192.168.5.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 104,105
+ staArr: 106
+ crnId: 2
# LED4
led[3]:
id: 4
- ip: 10.10.10.192
+ ip: 192.168.5.107
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 106
\ No newline at end of file
+ staArr: 107
+ crnId: 2
\ No newline at end of file
--
Gitblit v1.9.1