From 710deccd42576ad2dcbdc22e75f18b455d5ce2ff Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 14 四月 2025 18:04:00 +0800
Subject: [PATCH] 1
---
src/main/resources/application.yml | 209 ++++++++++++++++++++--------------------------------
1 files changed, 80 insertions(+), 129 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index db898dd..fe46e6f 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://192.168.10.201:3306/fyxc_shuttle?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,151 +39,102 @@
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[1].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 103
- backSta: 102
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[2].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 100
- backSta: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 103
- backSta: 102
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[2].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[1].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- pickInSta[1]:
- staNo: 103
- backSta: 103
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[2].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
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.152
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.153
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.154
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 104
-
# 鍥涘悜绌挎杞�1
shuttle[0]:
id: 1
- ip: 10.10.10.101
+ ip: 192.168.10.81
port: 8888
rack: 0
slot: 0
+ threadImpl: NyShuttleThread
# 鍥涘悜绌挎杞�2
shuttle[1]:
id: 2
- ip: 10.10.10.102
+ ip: 192.168.10.83
port: 8888
rack: 0
slot: 0
- # 璐у弶鎻愬崌鏈�1
- forkLift[0]:
+ threadImpl: NyShuttleThread
+ # 鎻愬崌鏈�1
+ lift[0]:
id: 1
- ip: 10.10.10.131
+ ip: 192.168.10.51
+ port: 102
+ threadImpl: NyLiftThread
+ row: 2
+ bay: 3
+ standByInRow: 2
+ standByInBay: 1
+ standByOutRow: 2
+ standByOutBay: 2
+ staRow: 2
+ staBay: 1
+ devp[0]:
+ id: 1
+ ip: 192.168.10.51
port: 102
rack: 0
slot: 0
- staRow: 13
- staBay: 22
- sta[0]:
- staNo: 101
- lev: 1
- liftNo: ${wcs-slave.forkLift[0].id}
- sta[1]:
- staNo: 102
- lev: 2
- liftNo: ${wcs-slave.forkLift[0].id}
- sta[2]:
- staNo: 103
- lev: 3
- liftNo: ${wcs-slave.forkLift[0].id}
- sta[3]:
- staNo: 104
- lev: 4
- liftNo: ${wcs-slave.forkLift[0].id}
- sta[4]:
- staNo: 105
- lev: 5
- liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
+ threadImpl: FyDevpThread
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 1012
+ backSta: 1011
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 1014
+ backSta: 1013
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 1022
+ backSta: 1021
+ led: ${wcs-slave.led[2].id}
+ # 鍏ュ簱鍙�4
+ inSta[3]:
+ staNo: 1025
+ backSta: 1024
+ led: ${wcs-slave.led[3].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 1011
+ outSta[1]:
+ staNo: 1013
+ outSta[2]:
+ staNo: 1021
+ outSta[3]:
+ staNo: 1024
+ # LED1
+ led[0]:
+ id: 1
+ ip: 192.168.10.62
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ # LED2
+ led[1]:
+ id: 2
+ ip: 192.168.10.63
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ # LED3
+ led[2]:
+ id: 3
+ ip: 192.168.10.64
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ # LED4
+ led[3]:
+ id: 4
+ ip: 192.168.10.65
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+
+
+
+
--
Gitblit v1.9.1