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 | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index c4b2797..5e19374 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -354,7 +354,7 @@
# 杈撻�佺嚎1 鍘熺偣渚ц緭閫佺嚎
devp[0]:
id: 1
- ip: 10.10.10.120
+ ip: 10.10.10.134
port: 102
rack: 0
slot: 0
@@ -635,4 +635,35 @@
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