From 92167e0e41a8b63c4aa53dc8d75e83bbac70169b Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 18 九月 2025 11:16:52 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 403 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 339 insertions(+), 64 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3ccee77..c1bff08 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
+ url: jdbc:sqlserver://10.10.10.233:1433;databasename=phpsasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
username: sa
password: sa@123
mvc:
@@ -34,20 +35,20 @@
enable: false
wms:
- url: localhost:8080/bgwms
+ url: localhost:8088/pswms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1,4,5,8,9,12,13,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
@@ -57,49 +58,49 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
+ staNo: 110
row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 210
row: 2
- bay: 24
- lev: 1
+ bay: 1
+ lev: 2
# 鍫嗗灈鏈哄叆搴撶珯鐐�3
crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 3
- bay: 24
- lev: 1
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 310
+ row: 2
+ bay: 1
+ lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 2
+ staNo: 111
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 2
- bay: 24
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 211
+ row: 1
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 3
- bay: 24
- lev: 1
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 311
+ row: 1
+ bay: 1
+ lev: 3
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.20
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
@@ -109,102 +110,376 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 7
+ staNo: 108
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 6
- bay: 24
- lev: 1
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 208
+ row: 4
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 308
+ row: 4
+ bay: 1
+ lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 7
+ staNo: 109
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 209
+ row: 3
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 309
+ row: 3
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.10.10.120
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
+ crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
+ staNo: 106
row: 6
- bay: 24
+ bay: 1
lev: 1
- # 杈撻�佺嚎
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 206
+ row: 6
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 306
+ row: 6
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 107
+ row: 5
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 207
+ row: 5
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 307
+ row: 5
+ bay: 1
+ lev: 3
+ # 杈撻�佺嚎1妤�
devp[0]:
id: 1
- ip: 10.10.10.30
+ ip: 10.10.10.130
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 101
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ backSta: 100
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 102
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ backSta: 104
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 101
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 103
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 105
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 100
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 102
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 104
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 101
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 102
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 104
+ # 杈撻�佺嚎2妤�
+ devp[1]:
+ id: 2
+ ip: 10.10.10.140
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 201
- barcode: ${wcs-slave.barcode[2].id}
- # 鍏ュ簱鍙�2
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[3].id}
+ backSta: 200
+ # 鍏ュ簱鍙�2
inSta[1]:
- staNo: 109
-# barcode: ${wcs-slave.barcode[0].id}
+ staNo: 203
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[4].id}
+ backSta: 202
# 鍏ュ簱鍙�3
inSta[2]:
- staNo: 103
-# barcode: ${wcs-slave.barcode[0].id}
+ staNo: 205
+ barcode: ${wcs-slave.barcode[5].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 204
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 201
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 109
+ staNo: 203
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
- staNo: 103
+ staNo: 205
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 201
+ staNo: 200
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 104
+ staNo: 202
# 鍑哄簱鍙�3
outSta[2]:
- staNo: 110
+ staNo: 204
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 201
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[3].id}
+ backSta: 200
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 104
+ staNo: 203
+ barcode: ${wcs-slave.barcode[4].id}
+ backSta: 202
+ # 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
- staNo: 110
- # 鏉＄爜鎵弿浠�
+ staNo: 205
+ barcode: ${wcs-slave.barcode[5].id}
+ backSta: 204
+ # 杈撻�佺嚎3妤�
+ devp[2]:
+ id: 3
+ ip: 10.10.10.150
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 301
+ barcode: ${wcs-slave.barcode[6].id}
+ led: ${wcs-slave.led[6].id}
+ backSta: 300
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 303
+ barcode: ${wcs-slave.barcode[7].id}
+ led: ${wcs-slave.led[7].id}
+ backSta: 302
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 305
+ barcode: ${wcs-slave.barcode[8].id}
+ led: ${wcs-slave.led[8].id}
+ backSta: 304
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 301
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 303
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 305
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 300
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 302
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 304
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 301
+ barcode: ${wcs-slave.barcode[6].id}
+ backSta: 300
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 303
+ barcode: ${wcs-slave.barcode[7].id}
+ backSta: 302
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 305
+ barcode: ${wcs-slave.barcode[8].id}
+ backSta: 304
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.30
+ ip: 10.10.10.133
port: 51236
+ # 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.30
+ ip: 10.10.10.134
port: 51236
+ # 鏉＄爜鎵弿浠�3
barcode[2]:
id: 3
- ip: 10.10.10.30
+ ip: 10.10.10.135
port: 51236
-
+ # 鏉＄爜鎵弿浠�4
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.143
+ port: 51236
+ # 鏉＄爜鎵弿浠�5
+ barcode[4]:
+ id: 5
+ ip: 10.10.10.144
+ port: 51236
+ # 鏉＄爜鎵弿浠�6
+ barcode[5]:
+ id: 6
+ ip: 10.10.10.145
+ port: 51236
+ # 鏉＄爜鎵弿浠�7
+ barcode[6]:
+ id: 7
+ ip: 10.10.10.153
+ port: 51236
+ # 鏉＄爜鎵弿浠�8
+ barcode[7]:
+ id: 8
+ ip: 10.10.10.154
+ port: 51236
+ # 鏉＄爜鎵弿浠�9
+ barcode[8]:
+ id: 9
+ ip: 10.10.10.155
+ port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.11
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 015
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.12
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
\ No newline at end of file
+ staArr: 102
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.13
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 104
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.14
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 200
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.15
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 202
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.10.16
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 204
+ # LED7
+ led[6]:
+ id: 7
+ ip: 10.10.10.17
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staArr: 300
+ # LED8
+ led[7]:
+ id: 8
+ ip: 10.10.10.18
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staArr: 302
+ # LED9
+ led[8]:
+ id: 9
+ ip: 10.10.10.17
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staArr: 304
--
Gitblit v1.9.1