From 352f73dcbf912a22b2c7c14dc73eebb2fdeef64f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 14:43:31 +0800
Subject: [PATCH] 1
---
src/main/resources/application.yml | 235 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 154 insertions(+), 81 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3250e87..e68a9a4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
+ url: jdbc:sqlserver://172.17.20.240:1433;databasename=sxjzasrs
username: sa
password: sa@123
mvc:
@@ -34,21 +34,21 @@
enable: false
wms:
- url: localhost:8081/lywms
+ url: 172.17.20.240:8080/jzwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 3
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
- port: 102
+ ip: 10.10.10.10
+ port: 0
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -57,22 +57,22 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 104
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 100
row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.111
- port: 102
+ ip: 10.10.10.20
+ port: 0
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -81,22 +81,22 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
+ staNo: 204
+ row: 5
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
+ staNo: 200
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.121
- port: 102
+ ip: 10.10.10.30
+ port: 0
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -104,120 +104,193 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 304
- row: 11
- bay: 1
+ row: 7
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
- row: 10
- bay: 1
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 300
+ row: 6
+ bay: 0
lev: 1
- # 杈撻�佺嚎
+ crn[3]:
+ id: 4
+ ip: 10.10.10.40
+ port: 0
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 311
+ row: 9
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 315
+ row: 8
+ bay: 0
+ lev: 1
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
- port: 102
+ ip: 10.10.10.100
+ port: 0
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 203
+ staNo: 204
barcode: ${wcs-slave.barcode[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[2].id}
+ backSta: 203
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
+ staNo: 104
+ backSta: 103
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 203
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 305
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 102
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 202
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 303
+ staNo: 204
+ backSta: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 103
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 204
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 303
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 101
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 201
+ led: ${wcs-slave.led[1].id}
+ # 杈撻�佺嚎2
+ devp[1]:
+ id: 2
+ ip: 10.10.10.130
+ port: 0
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 304
barcode: ${wcs-slave.barcode[2].id}
- # 鏉＄爜鎵弿浠�
+ backSta: 303
+ led: ${wcs-slave.led[3].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[3].id}
+ backSta: 303
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[3].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 301
+ led: ${wcs-slave.led[2].id}
+
+
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 311
+ barcode: ${wcs-slave.barcode[3].id}
+ backSta: 312
+ led: ${wcs-slave.led[5].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 311
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 312
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 311
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[5].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 314
+ led: ${wcs-slave.led[4].id}
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
- port: 51236
+ # 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.52
- port: 51236
+ # 鏉＄爜鎵弿浠�3
barcode[2]:
id: 3
- ip: 10.10.10.52
- port: 51236
+ # 鏉＄爜鎵弿浠�3
+ barcode[3]:
+ id: 4
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.107
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
+ staArr: 101,104
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
+ staArr: 201,204
# LED3
led[2]:
id: 3
- ip: 10.10.10.203
+ ip: 10.10.10.108
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 124
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 301
# LED4
led[3]:
id: 4
- ip: 10.10.10.204
+ ip: 10.10.10.109
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 131
- # LED5
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 304
+ # LED3
led[4]:
id: 5
- ip: 10.10.10.205
+ ip: 10.10.10.110
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
- # LED6
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 311
+ # LED4
led[5]:
- id: 5
- ip: 10.10.10.206
+ id: 6
+ ip: 10.10.10.111
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
\ No newline at end of file
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 314
\ No newline at end of file
--
Gitblit v1.9.1