From 15bebd1398993db87e72f501d1dc64cc018e46ca Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 17 十一月 2025 13:13:00 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 234 ++++++++++++++-------------------------------------------
1 files changed, 59 insertions(+), 175 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 77f3960..4a6afa3 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=ynasrs
- url: jdbc:sqlserver://localhost:1433;databasename=ynasrs
- 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/shuttle_rcs?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
+ database: 6
+# 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
@@ -35,179 +39,59 @@
swagger:
enable: false
-wms:
- url: localhost:8081/ynwms
+pythonCalcPath: D:\\path\\cpu.py
+pythonCalcSimilarity: D:\\path\\similarity.py
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍙屾繁
- doubleDeep: true
- # 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 32
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 2
- # 绌挎杞﹂�氶亾搴撲綅
- channel: '0200201'
- # 鍫嗗灈鏈�1
- crn[0]:
+ # 鍥涘悜绌挎杞�1
+ shuttle[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.10.20.11
+ port: 8888
+ rack: 0
+ slot: 0
+ 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
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.20
+ threadImpl: LfdZyForkLiftMasterThread
+ # 璐у弶鎻愬崌鏈�1
+ forkLift[0]:
+ id: 1
+ ip: 10.10.20.20
port: 102
rack: 0
slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 111
- row: 17
- bay: 1
+ threadImpl: LfdZyForkLiftSlaveThread
+ masterId: 99
+ staRow: 9
+ staBay: 6
+ sta[0]:
+ staNo: 1001
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 18
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.30
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 119
- row: 32
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 117
- row: 30
- bay: 1
- lev: 1
- # 绌挎杞�1
- ste[0]:
- id: 1
- ip: 10.10.10.60
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�2
- ste[1]:
- id: 2
- ip: 10.10.10.61
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�3
- ste[2]:
- id: 3
- ip: 10.10.10.62
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�3
- ste[3]:
- id: 4
- ip: 10.10.10.63
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�3
- ste[4]:
- id: 5
- ip: 10.10.10.64
- port: 502
- rack: 0
- slot: 0
- # 杈撻�佺嚎
- devp[0]:
- id: 1
- ip: 10.10.10.50
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 102
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 201
- led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 102
- barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 100
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 101
- # 鎷ｆ枡鍑哄簱鍙�
- pickInSta[0]:
- staNo: 102
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
- led: ${wcs-slave.led[0].id}
- # 鏉＄爜鎵弿浠�
- barcode[0]:
- id: 1
- ip: 10.10.10.51
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[1]:
- id: 2
- ip: 10.10.10.54
- port: 51236
- # LED1
- led[0]:
- id: 1
- ip: 10.10.10.51
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
- # LED1
- led[1]:
- id: 2
- ip: 10.10.10.208
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 200
+ 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