From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 165 +++++++++++-------------------------------------------
1 files changed, 35 insertions(+), 130 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0db44b9..c53c388 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,11 +7,13 @@
application:
name: @pom.build.finalName@
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.125:1433;databasename=tzskasrs
- username: sa
-# password: Zoneyung@zy56$
- password: sa@123
+ hikari:
+ 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
+ username: root
+ password: root
mvc:
static-path-pattern: /**
redis:
@@ -40,9 +42,11 @@
wms:
url: 10.10.10.40:8080/tzskwms
+pythonCalcPath: D:\\path\\cpu.py
+pythonCalcSimilarity: D:\\path\\similarity.py
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
-
# 杈撻�佺嚎
devp[0]:
id: 1
@@ -55,29 +59,29 @@
staNo: 100
backSta: 101
barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- liftNo: ${wcs-slave.lift[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[2].id}
- liftNo: ${wcs-slave.lift[0].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[1].id}
- liftNo: ${wcs-slave.lift[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[2].id}
- liftNo: ${wcs-slave.lift[0].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.forkLift[0].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
@@ -91,14 +95,14 @@
staNo: 100
backSta: 100
barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- liftNo: ${wcs-slave.lift[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[2].id}
- liftNo: ${wcs-slave.lift[0].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.forkLift[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
@@ -118,142 +122,43 @@
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
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.155
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 201
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.155
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 202
- # LED7
- led[6]:
- id: 7
- ip: 10.10.10.155
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 204
- # LED8
- led[7]:
- id: 8
- ip: 10.10.10.155
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 325
- # LED9
- led[8]:
- id: 9
- ip: 10.10.10.155
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 331
- # LED10
- led[9]:
- id: 10
- ip: 10.10.10.155
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 333
- # LED11
- led[10]:
- id: 11
- ip: 10.10.10.155
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 339
- # LED11
- led[11]:
- id: 12
- ip: 10.10.10.155
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 345
# 鍥涘悜绌挎杞�1
shuttle[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.10.20.11
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�2
shuttle[1]:
id: 2
- ip: 10.10.10.102
+ ip: 10.10.20.12
port: 8888
rack: 0
slot: 0
- # 鎻愬崌鏈�1
- lift[0]:
+ # 璐у弶鎻愬崌鏈�1
+ forkLift[0]:
id: 1
- ip: 10.10.10.131
+ ip: 10.10.20.20
port: 102
- staRow: 13
- staBay: 22
+ rack: 0
+ slot: 0
+ staRow: 9
+ staBay: 6
sta[0]:
staNo: 101
lev: 1
- liftNo: ${wcs-slave.lift[0].id}
+ liftNo: ${wcs-slave.forkLift[0].id}
sta[1]:
staNo: 102
lev: 2
- liftNo: ${wcs-slave.lift[0].id}
+ liftNo: ${wcs-slave.forkLift[0].id}
sta[2]:
staNo: 103
lev: 3
- liftNo: ${wcs-slave.lift[0].id}
+ liftNo: ${wcs-slave.forkLift[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
+ liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
--
Gitblit v1.9.1