From f9a4e6ce9b400a30aeac6d91831e8785368ea839 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 06 九月 2024 16:48:57 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 336 ++------------------------------------------------------
1 files changed, 12 insertions(+), 324 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 47fb6bf..1240f17 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdzbasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8080/mdqdwms
+ url: localhost:8080/wms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -47,326 +47,49 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.200
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 1
demo: false
# 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1003
+ staNo: 1001
row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1022
- row: 3
- bay: 1
- lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1006
+ staNo: 1002
row: 3
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1016
- row: 3
- bay: 1
- lev: 3
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.201
- 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.111
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 1002
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 1001
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 1012
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 1011
- led: ${wcs-slave.led[3].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 3007
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 3007
- led: ${wcs-slave.led[4].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 3012
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 3012
- led: ${wcs-slave.led[5].id}
- outSta[0]:
- staNo: 1006
- led: ${wcs-slave.led[1].id}
- outSta[1]:
- staNo: 1010
- led: ${wcs-slave.led[2].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 1002
- led: ${wcs-slave.led[0].id}
- emptyInSta[1]:
- staNo: 1012
- led: ${wcs-slave.led[3].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 1002
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 1001
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 1012
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 1011
- led: ${wcs-slave.led[3].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 3007
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 3007
- led: ${wcs-slave.led[4].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 3012
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 3012
- led: ${wcs-slave.led[5].id}
- # 鎷嗙洏鏈哄嚭绌烘墭
- autoEmptyOut[0]:
- staNo: 1007
- # 鎷嗙洏鏈哄叆绌烘墭
- 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
- # 杈撻�佺嚎5
- devp[4]:
- id: 5
- ip: 10.10.10.55
- port: 102
- rack: 0
- slot: 0
- # 杈撻�佺嚎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
+ staNo: 1001
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1001
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: 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
- # RGV2
- rgv[1]:
- id: 1
- ip: 10.10.10.133
- port: 102
- rack: 0
- slot: 0
- # 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
+ outSta[0]:
+ staNo: 1002
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
ip: 10.10.10.5
- port: 51236
- # 鏉＄爜鎵弿浠�2
- barcode[1]:
- id: 2
- ip: 10.10.10.6
- port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.3
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.3
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[4]:
- id: 5
- ip: 10.10.10.3
port: 51236
# LED1
@@ -376,38 +99,3 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 1002
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.152
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1004
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.153
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1008
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.154
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1012
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 3007
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 3012
\ No newline at end of file
--
Gitblit v1.9.1