From 947548b1c3545aa7c8ec80c2632921e7419ba09e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 18 五月 2024 16:51:49 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 280 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 187 insertions(+), 93 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1a007fe..ce8922a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 9090
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://10.10.10.200:1433;databasename=mdqdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
username: sa
password: sa@123
mvc:
@@ -47,7 +47,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.10.10.200
port: 102
rack: 0
slot: 0
@@ -85,7 +85,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.110
+ ip: 10.10.10.201
port: 102
rack: 0
slot: 0
@@ -120,48 +120,34 @@
row: 6
bay: 1
lev: 3
- # 鍫嗗灈鏈�2
-# crn[2]:
-# id: 3
-# ip: 10.10.10.110
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯1
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1013
-# row: 7
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄叆搴撶珯2
-# crnInStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1025
-# row: 6
-# bay: 1
-# lev: 3
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1010
-# row: 6
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
-# crnOutStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1019
-# row: 6
-# bay: 1
-# lev: 3
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 5
+ ip: 10.10.10.120
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯1
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 5001
+ row: 4
+ bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 5002
+ row: 4
+ bay: 1
+ lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.1
+ ip: 10.10.10.111
port: 102
rack: 0
slot: 0
@@ -232,58 +218,161 @@
# 鎷嗙洏鏈哄叆绌烘墭
autoEmptyIn[0]:
staNo: 1007
+ # 杈撻�佺嚎2
+ devp[1]:
+ id: 2
+ ip: 10.10.10.10
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 2106
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 2105
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 2106
+ led: ${wcs-slave.led[0].id}
+ # 杈撻�佺嚎3
+ devp[2]:
+ id: 3
+ ip: 10.10.10.30
+ port: 102
+ rack: 0
+ slot: 0
+ # 杈撻�佺嚎4
+ devp[3]:
+ id: 4
+ ip: 10.10.10.33
+ port: 102
+ rack: 0
+ slot: 0
+ emptyInSta[0]:
+ staNo: 4007
+ # 杈撻�佺嚎5
+ devp[4]:
+ id: 5
+ ip: 10.10.10.55
+ port: 102
+ rack: 0
+ slot: 0
+ emptyInSta[0]:
+ staNo: 4016
+ # 杈撻�佺嚎5
+ devp[5]:
+ id: 6
+ ip: 10.10.10.14
+ port: 102
+ rack: 0
+ slot: 0
+ # 杈撻�佺嚎5
+ devp[6]:
+ id: 7
+ ip: 10.10.10.20
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 3006
+ barcode: ${wcs-slave.barcode[3].id}
+ backSta: 3007
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 3011
+ barcode: ${wcs-slave.barcode[4].id}
+ backSta: 3012
+ led: ${wcs-slave.led[0].id}
- # RGV1
-# rgv[0]:
-# id: 1
-# ip: 10.10.10.120
-# port: 102
-# rack: 0
-# slot: 0
-# inStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 2401
-# inStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 2114
-# outStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 1014
-# outStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 1017
-# # RGV2
-# rgv[1]:
-# id: 2
-# ip: 10.10.10.121
-# port: 102
-# rack: 0
-# slot: 0
-# inStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 3001
-# outStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 2402
# # RGV1
-# rgv[2]:
-# id: 3
-# ip: 10.10.10.122
-# port: 102
-# rack: 0
-# slot: 0
-# inStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 2102
-# inStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 4007
-# inStn[2]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 4016
-# outStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# sourceStaNo: 2003
+ rgv[0]:
+ id: 2
+ ip: 10.10.10.130
+ port: 102
+ rack: 0
+ slot: 0
+ inStn[0]:
+ sourceStaNo: 4007
+ sourcePlcId: 4
+ staNo: 2103
+ staPlcId: 2
+ inStn[1]:
+ sourceStaNo: 2003
+ sourcePlcId: 2
+ inStn[2]:
+ sourceStaNo: 2102
+ sourcePlcId: 2
+ staNo: 2103
+ staPlcId: 2
+ inStn[3]:
+ sourceStaNo: 4016
+ sourcePlcId: 5
+ staNo: 2103
+ staPlcId: 2
+ outStn[0]:
+ staNo: 2103
+ staPlcId: 2
+ outStn[1]:
+ staNo: 2301
+ staPlcId: 2
+ # RGV2
+ rgv[1]:
+ id: 1
+ ip: 10.10.10.133
+ port: 102
+ rack: 0
+ slot: 0
+ inStn[0]:
+ sourceStaNo: 2114
+ sourcePlcId: 6
+ inStn[1]:
+ sourceStaNo: 2401
+ sourcePlcId: 6
+ inStn[2]:
+ sourceStaNo: 1014
+ sourcePlcId: 1
+ inStn[3]:
+ sourceStaNo: 1017
+ sourcePlcId: 1
+ outStn[0]:
+ staNo: 1020
+ staPlcId: 1
+ outStn[1]:
+ staNo: 1023
+ staPlcId: 1
+ outStn[2]:
+ staNo: 2013
+ staPlcId: 6
+ outStn[3]:
+ staNo: 2401
+ staPlcId: 6
+ # RGV1
+ rgv[2]:
+ id: 3
+ ip: 10.10.10.135
+ port: 102
+ rack: 0
+ slot: 0
+ inStn[0]:
+ sourceStaNo: 2402
+ sourcePlcId: 6
+ staNo: 3001
+ staPlcId: 7
+ inStn[1]:
+ sourceStaNo: 3001
+ sourcePlcId: 7
+ staNo: 2402
+ staPlcId: 6
+ outStn[0]:
+ staNo: 2402
+ staPlcId: 6
+ outStn[1]:
+ staNo: 3001
+ staPlcId: 7
+
# 鏉＄爜鎵弿浠�1
barcode[0]:
@@ -305,6 +394,11 @@
id: 4
ip: 10.10.10.3
port: 51236
+ # 鏉＄爜鎵弿浠�4
+ barcode[4]:
+ id: 5
+ ip: 10.10.10.3
+ port: 51236
# LED1
led[0]:
--
Gitblit v1.9.1