From 7c074b47b7ce8530e5fffb3533f17475053d5152 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 21 十一月 2022 08:41:10 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 270 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 198 insertions(+), 72 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 45ee0c8..71c4e0a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8081
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://localhost:1433;databasename=lfdasrs
username: sa
password: sa@123
mvc:
@@ -34,14 +34,14 @@
enable: false
wms:
- url: localhost:8081/lywms
+ url: localhost:8080/lfdwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 9,12,15,18
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -57,14 +57,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 3
+ staNo: 105
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 106
row: 2
bay: 1
lev: 1
@@ -81,15 +81,15 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
+ staNo: 113
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
+ staNo: 114
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈�3
@@ -105,78 +105,232 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 11
+ staNo: 121
+ row: 5
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
+ staNo: 122
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.121
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 129
+ row: 7
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 130
+ row: 8
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�5
+ crn[4]:
+ id: 5
+ ip: 10.10.10.121
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
row: 10
bay: 1
lev: 1
-
- # 杈撻�佺嚎
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 203
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�6
+ crn[5]:
+ id: 6
+ ip: 10.10.10.121
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 208
+ row: 13
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 209
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�7
+ crn[6]:
+ id: 7
+ ip: 10.10.10.121
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 214
+ row: 16
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 215
+ row: 17
+ bay: 1
+ lev: 1
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 109
barcode: ${wcs-slave.barcode[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
+ staNo: 117
+ barcode: ${wcs-slave.barcode[0].id}
# 鍏ュ簱鍙�3
inSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[2].id}
+ staNo: 101
+ barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
+ staNo: 109
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 203
- # 绌烘澘鍏ュ簱鍙�3
+ staNo: 117
+ # 绌烘澘鍏ュ簱鍙�2
emptyInSta[2]:
- staNo: 305
+ staNo: 101
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 102
+ staNo: 126
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 202
+ staNo: 134
+ # 鍑哄簱鍙�2
+ outSta[2]:
+ staNo: 100
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 126
+# barcode: ${wcs-slave.barcode[0].id}
+# # 鎷ｆ枡鍏ュ簱鍙�2
+# pickSta[1]:
+# staNo: 134
+# barcode: ${wcs-slave.barcode[0].id}
+ # 杈撻�佺嚎2
+ devp[1]:
+ id: 2
+ ip: 192.168.4.250
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 207
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 213
+ barcode: ${wcs-slave.barcode[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 201
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 207
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 213
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 205
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 211
# 鍑哄簱鍙�3
outSta[2]:
- staNo: 303
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 103
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[2].id}
- # 鏉＄爜鎵弿浠�
+ staNo: 217
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 011
+# barcode: ${wcs-slave.barcode[0].id}
+# # 鎷ｆ枡鍏ュ簱鍙�2
+# pickSta[1]:
+# staNo: 011
+# barcode: ${wcs-slave.barcode[0].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
+ # 鏉＄爜鎵弿浠�4
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�5
+ barcode[4]:
+ id: 5
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�6
+ barcode[5]:
+ id: 6
ip: 10.10.10.52
port: 51236
# LED1
@@ -185,39 +339,11 @@
ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
+ staArr: 015
# LED2
led[1]:
id: 2
ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.203
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 202
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.204
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 203
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.205
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 303
- # LED6
- led[5]:
- id: 5
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 305
\ No newline at end of file
+ staArr: 011
\ No newline at end of file
--
Gitblit v1.9.1