From 15bebd1398993db87e72f501d1dc64cc018e46ca Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 17 十一月 2025 13:13:00 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 105 +++++++++-------------------------------------------
1 files changed, 19 insertions(+), 86 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 35545c5..4a6afa3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/lfdwcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/shuttle_rcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: root
mvc:
@@ -19,7 +19,7 @@
redis:
host: 127.0.0.1
port: 6379
- database: 0
+ database: 6
# password: 123456
mybatis-plus:
@@ -39,90 +39,11 @@
swagger:
enable: false
-wms:
- url: 10.10.10.40:8080/tzskwms
-
pythonCalcPath: D:\\path\\cpu.py
pythonCalcSimilarity: D:\\path\\similarity.py
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 杈撻�佺嚎
- devp[0]:
- id: 1
- ip: 10.10.10.51
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 100
- backSta: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 103
- backSta: 102
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 100
- backSta: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 103
- backSta: 102
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 100
- led: ${wcs-slave.led[0].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 103
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�
- pickInSta[0]:
- staNo: 100
- backSta: 100
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- pickInSta[1]:
- staNo: 103
- backSta: 103
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
-
- # 鏉＄爜鎵弿浠�
- barcode[0]:
- id: 1
- ip: 10.10.10.102
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[1]:
- id: 2
- ip: 10.10.10.102
- port: 51236
-
- # LED1
- led[0]:
- id: 1
- ip: 10.10.10.151
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 99
-
# 鍥涘悜绌挎杞�1
shuttle[0]:
id: 1
@@ -130,6 +51,7 @@
port: 8888
rack: 0
slot: 0
+ threadImpl: NyShuttleThread
# 鍥涘悜绌挎杞�2
shuttle[1]:
id: 2
@@ -137,6 +59,15 @@
port: 8888
rack: 0
slot: 0
+ threadImpl: NyShuttleThread
+ # 璐у弶鎻愬崌鏈轰富绾跨▼
+ forkLiftMaster[0]:
+ id: 99
+ ip: 10.10.20.20
+ port: 102
+ rack: 0
+ slot: 0
+ threadImpl: LfdZyForkLiftMasterThread
# 璐у弶鎻愬崌鏈�1
forkLift[0]:
id: 1
@@ -144,21 +75,23 @@
port: 102
rack: 0
slot: 0
- staRow: 10
+ threadImpl: LfdZyForkLiftSlaveThread
+ masterId: 99
+ staRow: 9
staBay: 6
sta[0]:
- staNo: 101
+ staNo: 1001
lev: 1
liftNo: ${wcs-slave.forkLift[0].id}
sta[1]:
- staNo: 102
+ staNo: 1002
lev: 2
liftNo: ${wcs-slave.forkLift[0].id}
sta[2]:
- staNo: 103
+ staNo: 1003
lev: 3
liftNo: ${wcs-slave.forkLift[0].id}
sta[3]:
- staNo: 104
+ staNo: 1004
lev: 4
liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
--
Gitblit v1.9.1