From 48302c5c7f85bfdd52dfd071d7a9ef8628d87667 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 三月 2024 16:45:29 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 348 ++++++++++++++-------------------------------------------
1 files changed, 89 insertions(+), 259 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7da3fae..f6ed368 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=srjtasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ahyxasrs
username: sa
password: sa@123
mvc:
@@ -36,7 +36,7 @@
enable: false
wms:
- url: localhost:8080/hswms
+ url: localhost:8080/yxwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -49,7 +49,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.18.13
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -59,35 +59,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 3
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 201
- row: 3
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 100
- row: 2
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 200
- row: 2
- bay: 1
- lev: 2
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.18.21
+ ip: 10.10.10.130
port: 102
rack: 0
slot: 0
@@ -97,35 +85,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 7
+ staNo: 145
+ staNoOther: 144
+ row: 8
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
- row: 7
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 6
+ staNo: 148
+ staNoOther: 149
+ row: 5
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.18.29
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -135,35 +111,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 11
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
- row: 11
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 10
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 204
- row: 10
- bay: 1
- lev: 2
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 192.168.18.37
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -173,35 +137,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 111
- row: 15
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 207
- row: 15
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 14
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 206
- row: 14
- bay: 1
- lev: 2
# 鍫嗗灈鏈�5
crn[4]:
id: 5
- ip: 192.168.18.45
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -211,35 +163,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 19
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 209
- row: 19
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- row: 18
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 208
- row: 18
- bay: 1
- lev: 2
# 鍫嗗灈鏈�6
crn[5]:
id: 6
- ip: 192.168.18.53
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -249,32 +189,45 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 117
- row: 23
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 211
- row: 23
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 115
- row: 22
+ staNo: 100
+ staNoOther: 101
+ row: 1
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�7
+ crn[6]:
+ id: 7
+ ip: 10.10.10.120
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 210
- row: 22
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
- lev: 2
-
+ lev: 1
# RGV绌挎杞�1
rgv[0]:
id: 1
@@ -303,144 +256,35 @@
rgvDestStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 103
- # RGV绌挎杞�2
- rgv[1]:
- id: 2
- ip: 192.168.18.79
- port: 502
- rack: 0
- slot: 0
- #RGV鍏ュ簱婧愮珯鐐�
- rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- #RGV鍑哄簱婧愮珯鐐�
- rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- #RGV鐩爣绔欑偣
- rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.18.71
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 122
- # WMS鍏ュ簱鍙�1
- inWmsSta[0]:
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ singleSta[0]:
+ staNo: 153
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�2
+ singleSta[1]:
staNo: 145
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 122
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 122
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[0]:
- staNo: 118
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[1]:
- staNo: 119
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[2]:
- staNo: 120
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[3]:
- staNo: 121
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 122
- # Rgv鍑哄簱鍙�1
- outRgvSta[0]:
- staNo: 102
- # Rgv鍑哄簱鍙�1
- outRgvSta[1]:
- staNo: 105
- # Rgv鍑哄簱鍙�1
- outRgvSta[2]:
- staNo: 108
- # Rgv鍑哄簱鍙�1
- outRgvSta[3]:
- staNo: 111
- # Rgv鍑哄簱鍙�1
- outRgvSta[4]:
- staNo: 114
- # Rgv鍑哄簱鍙�1
- outRgvSta[5]:
- staNo: 117
- # Rgv鍏ュ簱鍙�1
- inRgvSta[0]:
- staNo: 118
- # Rgv鍏ュ簱鍙�1
- inRgvSta[1]:
- staNo: 119
- # Rgv鍏ュ簱鍙�1
- inRgvSta[2]:
- staNo: 120
- # Rgv鍏ュ簱鍙�1
- inRgvSta[3]:
- staNo: 121
- # Rgv鍏ュ簱鍙�1
- inRgvSta[4]:
- staNo: 122
- # Rgv鍏ュ簱鍙�1
- inRgvSta[5]:
- staNo: 123
-
- # 杈撻�佺嚎
- devp[1]:
- id: 2
- ip: 192.168.18.81
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 217
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 221
- barcode: ${wcs-slave.barcode[1].id}
- # WMS鍏ュ簱鍙�1
- inWmsSta[0]:
- staNo: 212
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 212
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 212
- # 鍑哄簱鍙�1
- outSta[1]:
- staNo: 213
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 212
- # 2妤肩爜鍨涗綅缃�
- driveSta[0]:
- staNo: 215
- barcode: ${wcs-slave.barcode[3].id}
- # 2妤肩爜鍨涗綅缃�
- driveSta[1]:
- staNo: 219
- barcode: ${wcs-slave.barcode[4].id}
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inSingleSta[0]:
+ staNo: 174
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+ emptyInSingleSta[0]:
+ staNo: 104
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inLargeSta[0]:
+ staNo: 153
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inLargeSta[1]:
+ staNo: 145
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+ emptyInLargeSta[0]:
+ staNo: 104
# 鏉＄爜鎵弿浠�
barcode[0]:
@@ -473,18 +317,4 @@
ip: 192.168.18.5
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 144
- # LED2
- led[1]:
- id: 2
- ip: 192.168.18.6
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 217
- # LED3
- led[2]:
- id: 3
- ip: 192.168.18.7
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 221
\ No newline at end of file
+ staArr: 144
\ No newline at end of file
--
Gitblit v1.9.1