From 50add1caee430cc5e70e53cdae138abf30ae98a3 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 22 一月 2026 17:47:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yhfzwcs' into yhfzwcs
---
src/main/resources/application-dev.yml | 131 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 49 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 935b12a..5e19374 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -44,6 +44,8 @@
doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
+ # 鏄惁妫�鏌ュ爢鍨涙満鍑哄簱绔欑姸鎬侊紙true: 妫�鏌ワ紝false: 涓嶆鏌ワ級
+ checkOutStationStatus: true
# 鍫嗗灈鏈�1
crn[0]:
@@ -217,7 +219,7 @@
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1032
+ staNo: 1034
row: 19
bay: 1
lev: 1
@@ -352,7 +354,7 @@
# 杈撻�佺嚎1 鍘熺偣渚ц緭閫佺嚎
devp[0]:
id: 1
- ip: 10.10.10.120
+ ip: 10.10.10.134
port: 102
rack: 0
slot: 0
@@ -362,89 +364,89 @@
staNo: 1041
barcode: ${wcs-slave.barcode[0].id}
backSta: 1042
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 1042
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
staNo: 1043
barcode: ${wcs-slave.barcode[1].id}
backSta: 1044
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
staNo: 1044
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�3
inSta[2]:
staNo: 1045
barcode: ${wcs-slave.barcode[2].id}
backSta: 1046
- led: ${wcs-slave.led[2].id}
+ led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�3
outSta[2]:
staNo: 1046
- led: ${wcs-slave.led[2].id}
+ led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�4
inSta[3]:
staNo: 1047
barcode: ${wcs-slave.barcode[3].id}
backSta: 1048
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�4
outSta[3]:
staNo: 1048
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 1041
barcode: ${wcs-slave.barcode[0].id}
backSta: 1042
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 1043
barcode: ${wcs-slave.barcode[1].id}
backSta: 1044
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
staNo: 1045
barcode: ${wcs-slave.barcode[2].id}
backSta: 1046
- led: ${wcs-slave.led[2].id}
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�4
emptyInSta[3]:
staNo: 1047
barcode: ${wcs-slave.barcode[3].id}
backSta: 1048
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[2].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 1041
barcode: ${wcs-slave.barcode[0].id}
backSta: 1042
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 1043
barcode: ${wcs-slave.barcode[1].id}
backSta: 1044
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 1045
barcode: ${wcs-slave.barcode[2].id}
backSta: 1046
- led: ${wcs-slave.led[2].id}
+ led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�4
pickSta[3]:
staNo: 1047
barcode: ${wcs-slave.barcode[3].id}
backSta: 1048
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[2].id}
# 杈撻�佺嚎2 鍙嶅師鐐逛晶杈撻�佺嚎
#涓滈潰
devp[1]:
@@ -457,27 +459,27 @@
# 鍏ュ簱鍙�5
inSta[0]:
staNo: 1002
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[4].id}
backSta: 1001
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�5
outSta[0]:
staNo: 1001
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鍏ュ簱鍙�6
inSta[1]:
staNo: 1004
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[5].id}
backSta: 1003
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�6
outSta[1]:
staNo: 1003
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鍏ュ簱鍙�7
inSta[2]:
staNo: 1006
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[6].id}
backSta: 1005
led: ${wcs-slave.led[4].id}
# 鍑哄簱鍙�7
@@ -487,61 +489,61 @@
# 鍏ュ簱鍙�8
inSta[3]:
staNo: 1008
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[7].id}
backSta: 1007
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[5].id}
# 鍑哄簱鍙�8
outSta[3]:
staNo: 1007
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[5].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 1002
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[4].id}
backSta: 1001
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 1004
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[5].id}
backSta: 1003
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
staNo: 1006
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[6].id}
backSta: 1005
led: ${wcs-slave.led[4].id}
# 绌烘澘鍏ュ簱鍙�4
emptyInSta[3]:
staNo: 1008
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[7].id}
backSta: 1007
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[5].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 1002
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[4].id}
backSta: 1001
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 1004
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[5].id}
backSta: 1003
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 1006
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[6].id}
backSta: 1005
led: ${wcs-slave.led[4].id}
# 鎷ｆ枡鍏ュ簱鍙�4
pickSta[3]:
staNo: 1008
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[7].id}
backSta: 1007
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[5].id}
@@ -589,7 +591,7 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.160
+ ip: 10.10.10.203
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 101
@@ -597,7 +599,7 @@
# LED2
led[1]:
id: 2
- ip: 10.10.10.161
+ ip: 10.10.10.204
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 104
@@ -605,7 +607,7 @@
# LED3
led[2]:
id: 3
- ip: 10.10.10.162
+ ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 106
@@ -613,7 +615,7 @@
# LED4
led[3]:
id: 4
- ip: 10.10.10.163
+ ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 107
@@ -621,7 +623,7 @@
# LED5
led[4]:
id: 5
- ip: 10.10.10.164
+ ip: 10.10.10.207
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 107
@@ -629,8 +631,39 @@
# LED6
led[5]:
id: 6
- ip: 10.10.10.165
+ ip: 10.10.10.208
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 107
- crnId: 2
\ No newline at end of file
+ crnId: 2
+
+ # RFID璇诲啓鍣ㄩ厤缃�
+ rfid-config:
+ # 鍏ㄥ眬榛樿閰嶇疆
+ reconnectInterval: 10 # 閲嶈繛闂撮殧锛堢锛�
+ tagScanInterval: 500 # 鏍囩妫�娴嬮棿闅旓紙姣锛�
+ tagScanTime: 10 # 鏍囩鎵弿鏃堕棿锛堝崟浣�: 100ms锛岄粯璁�10=1绉掞級
+ # RFID璇诲啓鍣�1
+ rfid[0]:
+ id: 1
+ ip: 10.10.10.210
+ port: 27011
+ autoConnect: true # 鏄惁鑷姩杩炴帴锛坱rue: 绯荤粺鍚姩鏃惰嚜鍔ㄨ繛鎺ワ紝false: 鎵嬪姩杩炴帴锛�
+ # RFID璇诲啓鍣�2
+ rfid[1]:
+ id: 2
+ ip: 10.10.10.211
+ port: 27011
+ autoConnect: true # 鏄惁鑷姩杩炴帴
+ # RFID璇诲啓鍣�3
+ rfid[2]:
+ id: 3
+ ip: 10.10.10.212
+ port: 27011
+ autoConnect: true # 鏄惁鑷姩杩炴帴
+ # RFID璇诲啓鍣�4
+ rfid[3]:
+ id: 4
+ ip: 10.10.10.213
+ port: 27011
+ autoConnect: true # 鏄惁鑷姩杩炴帴
\ No newline at end of file
--
Gitblit v1.9.1