From 12f980ced60db7aaa83f5fa3dc3eddfab0655c3e Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 16 九月 2025 09:54:21 +0800
Subject: [PATCH] 123
---
src/main/resources/application.yml | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7014689..06116b0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,11 @@
server:
- port: 9090
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
spring:
+ jmx:
+ enabled: false
application:
name: @pom.build.finalName@
datasource:
@@ -31,10 +33,13 @@
logging:
- path: ./stock/out/@pom.build.finalName@/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
+
+asrs:
+ wmsUrl: 192.168.10.201:8080/fyxcwms
swagger:
enable: false
@@ -44,16 +49,16 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # # 鍥涘悜绌挎杞�1
- # shuttle[0]:
- # id: 1
- # ip: 192.168.10.81
- # port: 8888
- # rack: 0
- # slot: 0
- # threadImpl: NyShuttleThread
- # 鍥涘悜绌挎杞�2
+ # 鍥涘悜绌挎杞�1
shuttle[0]:
+ id: 1
+ ip: 192.168.10.81
+ port: 8888
+ rack: 0
+ slot: 0
+ threadImpl: NyShuttleThread
+ # 鍥涘悜绌挎杞�2
+ shuttle[1]:
id: 2
ip: 192.168.10.83
port: 8888
@@ -68,8 +73,10 @@
threadImpl: NyLiftThread
row: 2
bay: 3
- standByRow: 2
- standByBay: 1
+ standByInRow: 2
+ standByInBay: 1
+ standByOutRow: 2
+ standByOutBay: 2
staRow: 2
staBay: 1
devp[0]:
@@ -78,6 +85,7 @@
port: 102
rack: 0
slot: 0
+ threadImpl: FyDevpThread
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 1012
@@ -100,35 +108,35 @@
led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 1012
+ staNo: 1011
outSta[1]:
- staNo: 1014
+ staNo: 1013
outSta[2]:
- staNo: 1022
+ staNo: 1021
outSta[3]:
- staNo: 1025
+ staNo: 1024
# LED1
led[0]:
id: 1
- ip: 192.168.10.62
+ ip: 192.168.10.160
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
# LED2
led[1]:
id: 2
- ip: 192.168.10.63
+ ip: 192.168.10.161
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
# LED3
led[2]:
id: 3
- ip: 192.168.10.64
+ ip: 192.168.10.162
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
# LED4
led[3]:
id: 4
- ip: 192.168.10.65
+ ip: 192.168.10.163
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
--
Gitblit v1.9.1