From 6cc6750ceb6993f8a20eb040b5601b34623f4717 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 04 七月 2025 08:15:26 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 210 +++++++++++++---------------------------------------
1 files changed, 53 insertions(+), 157 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4d37303..a6f6e03 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 9099
servlet:
context-path: /@pom.build.finalName@
@@ -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:
@@ -39,167 +39,63 @@
swagger:
enable: false
-wms:
- url: 10.10.10.40:8080/tzskwms
+pythonCalcPath: D:\\path\\cpu.py
+pythonCalcSimilarity: D:\\path\\similarity.py
+
+deviceMsgConfig:
+ # 璇诲彇鏁版嵁鍚庤嚜鍔ㄥ垹闄�
+ destroyAfterReading: true
# 涓嬩綅鏈洪厤缃�
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.lift[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 103
- backSta: 102
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[2].id}
- liftNo: ${wcs-slave.lift[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 100
- backSta: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- liftNo: ${wcs-slave.lift[0].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 103
- backSta: 102
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[2].id}
- liftNo: ${wcs-slave.lift[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.lift[0].id}
- pickInSta[1]:
- staNo: 103
- backSta: 103
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[2].id}
- liftNo: ${wcs-slave.lift[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.4.77
port: 8888
rack: 0
slot: 0
- # 鍥涘悜绌挎杞�2
- shuttle[1]:
- id: 2
- ip: 10.10.10.102
- port: 8888
- rack: 0
- slot: 0
- # 鎻愬崌鏈�1
- lift[0]:
- id: 1
- ip: 10.10.10.131
- port: 102
- staRow: 13
- staBay: 22
- sta[0]:
- staNo: 101
- lev: 1
- liftNo: ${wcs-slave.lift[0].id}
- sta[1]:
- staNo: 102
- lev: 2
- liftNo: ${wcs-slave.lift[0].id}
- sta[2]:
- staNo: 103
- lev: 3
- liftNo: ${wcs-slave.lift[0].id}
- sta[3]:
- staNo: 104
- lev: 4
- liftNo: ${wcs-slave.lift[0].id}
- sta[4]:
- staNo: 105
- lev: 5
- liftNo: ${wcs-slave.lift[0].id}
- sta[5]:
- staNo: 106
- lev: 6
- liftNo: ${wcs-slave.lift[0].id}
- sta[6]:
- staNo: 107
- lev: 7
- liftNo: ${wcs-slave.lift[0].id}
- sta[7]:
- staNo: 108
- lev: 8
- liftNo: ${wcs-slave.lift[0].id}
- sta[8]:
- staNo: 109
- lev: 9
- liftNo: ${wcs-slave.lift[0].id}
- sta[9]:
- staNo: 110
- lev: 10
- liftNo: ${wcs-slave.lift[0].id}
\ No newline at end of file
+ threadImpl: NyShuttleThread
+# # 鍥涘悜绌挎杞�2
+# shuttle[1]:
+# id: 2
+# ip: 10.10.20.12
+# 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
+# ip: 10.10.20.20
+# port: 102
+# rack: 0
+# slot: 0
+# threadImpl: LfdZyForkLiftSlaveThread
+# masterId: 99
+# staRow: 9
+# staBay: 6
+# sta[0]:
+# staNo: 1001
+# lev: 1
+# liftNo: ${wcs-slave.forkLift[0].id}
+# sta[1]:
+# staNo: 1002
+# lev: 2
+# liftNo: ${wcs-slave.forkLift[0].id}
+# sta[2]:
+# staNo: 1003
+# lev: 3
+# liftNo: ${wcs-slave.forkLift[0].id}
+# sta[3]:
+# staNo: 1004
+# lev: 4
+# liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
--
Gitblit v1.9.1