From e8e5e1325dc7fb32e73afd1ed20938ab89ce7421 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 09:01:38 +0800
Subject: [PATCH] 空板退回
---
src/main/resources/application-prod.yml | 95 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 32 deletions(-)
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 95657b2..2ec24d3 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -10,7 +10,7 @@
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://127.0.0.1:1433;databasename=yhfzasrs
username: sa
- password: sa@12345
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -459,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
@@ -489,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}
@@ -591,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
@@ -599,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
@@ -607,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
@@ -615,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
@@ -623,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
@@ -631,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