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 | 404 ++++++++-------------------------------------------------
1 files changed, 56 insertions(+), 348 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f6ec637..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.15: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:
@@ -29,7 +31,7 @@
logging:
- path: /stock/out/@pom.build.finalName@/logs
+ path: ./stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -38,419 +40,125 @@
enable: false
wms:
- url: localhost:8081/xzjlwms
+ url: 10.10.10.40:8080/tzskwms
-erp:
- db:
- driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- ur: jdbc:sqlserver://10.10.10.209:1433;databasename=POY_ASRS
- username: poy-asrs
- password: Poy@2022
+pythonCalcPath: D:\\path\\cpu.py
+pythonCalcSimilarity: D:\\path\\similarity.py
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍙屾繁
- doubleDeep: true
- # 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 32
-
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.10.10.51
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ 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: 102
+ staNo: 103
backSta: 102
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[1].id}
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 104
- backSta: 104
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 201
- backSta: 201
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�5
- inSta[4]:
- staNo: 202
- backSta: 202
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�6
- inSta[5]:
- staNo: 204
- backSta: 204
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�7
- inSta[6]:
- staNo: 340
- backSta: 340
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�8
- inSta[7]:
- staNo: 345
- backSta: 345
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.forkLift[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ 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: 102
+ staNo: 103
backSta: 102
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[1].id}
led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 104
- backSta: 104
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�4
- emptyInSta[3]:
- staNo: 201
- backSta: 201
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�5
- emptyInSta[4]:
- staNo: 202
- backSta: 202
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�6
- emptyInSta[5]:
- staNo: 204
- backSta: 204
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�7
- emptyInSta[6]:
- staNo: 340
- backSta: 340
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�8
- emptyInSta[7]:
- staNo: 345
- backSta: 345
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.forkLift[0].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 101
- led: ${wcs-slave.led[1].id}
+ staNo: 100
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 102
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 104
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 201
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�5
- outSta[4]:
- staNo: 202
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�6
- outSta[5]:
- staNo: 204
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�7
- outSta[6]:
- staNo: 301
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�8
- outSta[7]:
- staNo: 345
- led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍑哄簱鍙�
+ staNo: 103
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�
pickInSta[0]:
staNo: 100
+ backSta: 100
barcode: ${wcs-slave.barcode[0].id}
- backSta: 101
led: ${wcs-slave.led[0].id}
-# # 璐ф灦鍏ュ簱绔欑偣
-# rackInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 105
-# row: 4
-# bay: 6
-# lev: 1
-# # 璐ф灦鍏ュ簱绔欑偣
-# rackInStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 106
-# row: 4
-# bay: 6
-# lev: 3
-# # 璐ф灦鍏ュ簱绔欑偣
-# rackInStn[2]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 107
-# row: 4
-# bay: 6
-# lev: 6
-# # 璐ф灦鍏ュ簱绔欑偣
-# rackInStn[3]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 108
-# row: 4
-# bay: 6
-# lev: 6
-# # 璐ф灦鍑哄簱绔欑偣
-# rackOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 100
-# row: 15
-# bay: 2
-# lev: 1
-# # 璐ф灦鍑哄簱绔欑偣
-# rackOutStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 104
-# row: 4
-# bay: 6
-# lev: 1
-# # 璐ф灦鍑哄簱绔欑偣
-# rackOutStn[2]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 105
-# row: 4
-# bay: 6
-# lev: 3
-# # 璐ф灦鍑哄簱绔欑偣
-# rackOutStn[3]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 108
-# row: 4
-# bay: 6
-# lev: 6
+ 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.241
+ ip: 10.10.10.151
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.242
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 201
+ staArr: 99
# 鍥涘悜绌挎杞�1
shuttle[0]:
id: 1
- ip: 192.168.0.101
+ ip: 10.10.20.11
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�2
shuttle[1]:
id: 2
- ip: 10.10.10.221
+ ip: 10.10.20.12
port: 8888
rack: 0
slot: 0
- # 鍥涘悜绌挎杞�3
- shuttle[2]:
- id: 3
- ip: 10.10.10.221
- port: 8888
- rack: 0
- slot: 0
- # 鍥涘悜绌挎杞�4
- shuttle[3]:
- id: 4
- ip: 10.10.10.221
- port: 8888
- rack: 0
- slot: 0
- # 鍥涘悜绌挎杞�5
- shuttle[4]:
- id: 5
- ip: 10.10.10.221
- port: 8888
- rack: 0
- slot: 0
- # 鍥涘悜绌挎杞�6
- shuttle[5]:
- id: 6
- ip: 10.10.10.221
- port: 8888
- rack: 0
- slot: 0
- # 鍥涘悜绌挎杞�7
- shuttle[6]:
- id: 7
- ip: 10.10.10.221
- port: 8888
- rack: 0
- slot: 0
- # 鍥涘悜绌挎杞�8
- shuttle[7]:
- id: 8
- ip: 10.10.10.221
- port: 8888
- rack: 0
- slot: 0
- # 鍥涘悜绌挎杞�9
- shuttle[8]:
- id: 9
- ip: 10.10.10.221
- port: 8888
- rack: 0
- slot: 0
- # 鍥涘悜绌挎杞�10
- shuttle[9]:
- id: 10
- ip: 10.10.10.221
- port: 8888
- rack: 0
- slot: 0
- # 鎻愬崌鏈�1
- lift[0]:
+ # 璐у弶鎻愬崌鏈�1
+ forkLift[0]:
id: 1
- ip: 192.168.4.250
- port: 502
- row: 18
- bay: 2
+ ip: 10.10.20.20
+ port: 102
+ rack: 0
+ slot: 0
+ staRow: 9
+ staBay: 6
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
- sta[4]:
- staNo: 105
- lev: 5
- sta[5]:
- staNo: 106
- lev: 6
- sta[6]:
- staNo: 107
- lev: 7
- sta[7]:
- staNo: 108
- lev: 8
- sta[8]:
- staNo: 109
- lev: 9
- sta[9]:
- staNo: 110
- lev: 10
- # 鎻愬崌鏈�2
- lift[1]:
- id: 2
- ip: 127.0.0.1
- port: 502
- row: 18
- bay: 2
- sta[0]:
- staNo: 201
- lev: 1
- sta[1]:
- staNo: 202
- lev: 2
- sta[2]:
- staNo: 203
- lev: 3
- sta[3]:
- staNo: 204
- lev: 4
- sta[4]:
- staNo: 205
- lev: 5
- sta[5]:
- staNo: 206
- lev: 6
- sta[6]:
- staNo: 207
- lev: 7
- sta[7]:
- staNo: 208
- lev: 8
- sta[8]:
- staNo: 209
- lev: 9
- sta[9]:
- staNo: 210
- lev: 10
- # 鎻愬崌鏈�3
- lift[2]:
- id: 3
- ip: 127.0.0.1
- port: 502
- row: 18
- bay: 2
- sta[0]:
- staNo: 301
- lev: 1
- sta[1]:
- staNo: 302
- lev: 2
- sta[2]:
- staNo: 303
- lev: 3
- sta[3]:
- staNo: 304
- lev: 4
- sta[4]:
- staNo: 305
- lev: 5
- sta[5]:
- staNo: 306
- lev: 6
- sta[6]:
- staNo: 307
- lev: 7
- sta[7]:
- staNo: 308
- lev: 8
- sta[8]:
- staNo: 309
- lev: 9
- sta[9]:
- staNo: 310
- lev: 10
\ No newline at end of file
+ liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
--
Gitblit v1.9.1