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 | 244 +++++++++++++++---------------------------------
1 files changed, 78 insertions(+), 166 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 106bcfe..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://127.0.0.1:1433;databasename=xzjlasrs
- username: sa
-# password: Zoneyung@zy56$
- password: sa
+ 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,215 +40,125 @@
enable: false
wms:
- url: localhost:8080/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
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 2
- # 绌挎杞﹂�氶亾搴撲綅
- channel: '0100101'
-# # 鍫嗗灈鏈�1
-# crn[0]:
-# id: 1
-# ip: 10.10.10.110
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 102
-# row: 4
-# bay: 6
-# lev: 1
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 202
-# row: 4
-# bay: 6
-# lev: 3
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[2]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 302
-# row: 4
-# bay: 6
-# lev: 6
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 102
-# row: 4
-# bay: 6
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 202
-# row: 4
-# bay: 6
-# lev: 3
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[2]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 302
-# row: 4
-# bay: 6
-# lev: 6
-
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.10.10.51
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 100
- backSta: 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: 102
- backSta: 100
+ 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: 104
- led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍑哄簱鍙�
+ staNo: 100
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 103
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�
pickInSta[0]:
staNo: 100
- barcode: ${wcs-slave.barcode[0].id}
backSta: 100
+ barcode: ${wcs-slave.barcode[0].id}
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: 10.10.10.211
- port: 502
+ ip: 10.10.20.11
+ port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�2
-# shuttle[1]:
-# id: 2
-# ip: 192.168.4.22
-# port: 502
-# rack: 0
-# slot: 0
- # 鎻愬崌鏈�1
- lift[0]:
+ shuttle[1]:
+ id: 2
+ ip: 10.10.20.12
+ port: 8888
+ rack: 0
+ slot: 0
+ # 璐у弶鎻愬崌鏈�1
+ forkLift[0]:
id: 1
- ip: 10.10.10.231
- port: 502
- row: 18
- bay: 2
+ ip: 10.10.20.20
+ port: 102
+ rack: 0
+ slot: 0
+ staRow: 9
+ staBay: 6
sta[0]:
- staNo: 105
+ staNo: 101
lev: 1
+ liftNo: ${wcs-slave.forkLift[0].id}
sta[1]:
- staNo: 106
+ staNo: 102
lev: 2
+ liftNo: ${wcs-slave.forkLift[0].id}
sta[2]:
- staNo: 107
+ staNo: 103
lev: 3
+ liftNo: ${wcs-slave.forkLift[0].id}
sta[3]:
- staNo: 108
- lev: 4
\ No newline at end of file
+ staNo: 104
+ lev: 4
+ liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
--
Gitblit v1.9.1