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 | 219 ++++++++++++++++++++++++++----------------------------
1 files changed, 106 insertions(+), 113 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2d2c6e2..c53c388 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,27 +7,31 @@
application:
name: @pom.build.finalName@
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://47.97.1.152:51433;databasename=bfasrs
- url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
- 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:
- host: localhost
+ host: 127.0.0.1
port: 6379
database: 0
-# password: xltys1995
+# password: 123456
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
logging:
- path: /stock/out/@pom.build.finalName@/logs
+ path: ./stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -36,136 +40,125 @@
enable: false
wms:
- url: localhost:8081/bfmwms
+ url: 10.10.10.40:8080/tzskwms
+
+pythonCalcPath: D:\\path\\cpu.py
+pythonCalcSimilarity: D:\\path\\similarity.py
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍙屾繁
- doubleDeep: false
- # 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
- # 鍫嗗灈鏈�1
-# crn[0]:
-# id: 1
-# ip: 10.10.10.10
-# port: 102
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 100
-# row: 2
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 101
-# row: 3
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈�2
-# crn[1]:
-# id: 1
-# ip: 10.10.10.20
-# port: 102
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 100
-# row: 2
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 101
-# row: 3
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈�3
-# crn[2]:
-# id: 1
-# ip: 10.10.10.30
-# port: 102
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 100
-# row: 2
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 101
-# row: 3
-# bay: 1
-# lev: 1
- # 绌挎杞�1
- ste[0]:
- id: 1
- ip: 10.10.10.40
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�2
- ste[1]:
- id: 2
- ip: 10.10.10.41
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�3
- ste[2]:
- id: 3
- ip: 10.10.10.42
- port: 502
- rack: 0
- slot: 0
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.61
+ ip: 10.10.10.51
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ 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: 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: 176
+ 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: 173
+ staNo: 100
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 182
+ staNo: 103
+ led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 176
+ pickInSta[0]:
+ staNo: 100
+ backSta: 100
barcode: ${wcs-slave.barcode[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[0].id}
+ liftNo: ${wcs-slave.forkLift[0].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 10.10.10.52
+ 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.60
+ ip: 10.10.10.151
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 173
+ staArr: 99
+
+ # 鍥涘悜绌挎杞�1
+ shuttle[0]:
+ id: 1
+ ip: 10.10.20.11
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�2
+ shuttle[1]:
+ id: 2
+ ip: 10.10.20.12
+ port: 8888
+ rack: 0
+ slot: 0
+ # 璐у弶鎻愬崌鏈�1
+ forkLift[0]:
+ id: 1
+ 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
+ liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
--
Gitblit v1.9.1