From d6e4dfb1ac4c9bc1cff025d6215cd5023fd7a17e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 02 十二月 2023 13:23:27 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 330 +++++++-----------------------------------------------
1 files changed, 46 insertions(+), 284 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 30009b9..f86372d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=nbjfasrs
-# url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=mdqdasrs
username: sa
password: sa@123
mvc:
@@ -29,13 +28,13 @@
path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: xltys1995
+ pwd: asrs2023
swagger:
enable: false
wms:
- url: localhost:8080/nbjfwms
+ url: localhost:8080/mdqdwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -48,69 +47,27 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1
+ # 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
+ staNo: 1003
row: 2
- bay: 2
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- row: 2
- bay: 55
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 2
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 302
- row: 2
- bay: 55
- lev: 7
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 2
- bay: 2
+ staNo: 1006
+ row: 3
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- row: 2
- bay: 55
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 2
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 302
- row: 2
- bay: 55
- lev: 7
# 鍫嗗灈鏈�2
crn[1]:
id: 2
@@ -121,283 +78,88 @@
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1
+ # 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
+ staNo: 1013
row: 7
- bay: 2
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 116
- row: 7
- bay: 55
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
- row: 7
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐�4
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 305
- row: 7
- bay: 55
- lev: 7
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 7
- bay: 2
+ staNo: 1010
+ row: 6
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 116
- row: 7
- bay: 55
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
- row: 7
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 305
- row: 7
- bay: 55
- lev: 7
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.97
+ ip: 10.10.10.50
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 1003
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1001
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 111
+ staNo: 1013
barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1011
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 111
+ staNo: 102
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 110
+ staNo: 101
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 101
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 111
- barcode: ${wcs-slave.barcode[1].id}
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.90
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 104
- barcode: ${wcs-slave.barcode[2].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 114
- barcode: ${wcs-slave.barcode[3].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 201
- barcode: ${wcs-slave.barcode[4].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 204
- barcode: ${wcs-slave.barcode[5].id}
- # 鍏ュ簱鍙�5
- inSta[4]:
- staNo: 301
- barcode: ${wcs-slave.barcode[6].id}
- # 鍏ュ簱鍙�6
- inSta[5]:
- staNo: 304
- barcode: ${wcs-slave.barcode[7].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 104
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 114
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 201
- # 绌烘澘鍏ュ簱鍙�4
- emptyInSta[3]:
- staNo: 204
- # 绌烘澘鍏ュ簱鍙�5
- emptyInSta[4]:
- staNo: 301
- # 绌烘澘鍏ュ簱鍙�6
- emptyInSta[5]:
- staNo: 304
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 103
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 113
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 200
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 203
- # 鍑哄簱鍙�5
- outSta[4]:
- staNo: 300
- # 鍑哄簱鍙�6
- outSta[5]:
- staNo: 303
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 104
- barcode: ${wcs-slave.barcode[2].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 114
- barcode: ${wcs-slave.barcode[3].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 201
- barcode: ${wcs-slave.barcode[4].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 204
- barcode: ${wcs-slave.barcode[5].id}
- # 鎷ｆ枡鍏ュ簱鍙�5
- pickSta[4]:
- staNo: 301
- barcode: ${wcs-slave.barcode[6].id}
- # 鎷ｆ枡鍏ュ簱鍙�6
- pickSta[5]:
- staNo: 304
- barcode: ${wcs-slave.barcode[7].id}
-
+ backSta: 102
+ led: ${wcs-slave.led[0].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.10.10.3
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.101
+ ip: 10.10.10.3
port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.102
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.103
- port: 51236
- # 鏉＄爜鎵弿浠�5
- barcode[4]:
- id: 5
- ip: 10.10.10.104
- port: 51236
- # 鏉＄爜鎵弿浠�6
- barcode[5]:
- id: 6
- ip: 10.10.10.105
- port: 51236
- # 鏉＄爜鎵弿浠�7
- barcode[6]:
- id: 7
- ip: 10.10.10.106
- port: 51236
- # 鏉＄爜鎵弿浠�8
- barcode[7]:
- id: 8
- ip: 10.10.10.59
- port: 51236
+
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.203
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.204
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 113
- # LED5
- led[4]:
- id: 5
ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 200
- # LED6
- led[5]:
- id: 6
+ staArr: 1003
+ # LED2
+ led[1]:
+ id: 2
ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 203
- # LED7
- led[6]:
- id: 7
- ip: 10.10.10.207
+ staArr: 1006
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 300
- # LED8
- led[7]:
- id: 8
- ip: 10.10.10.208
+ staArr: 1010
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 303
\ No newline at end of file
+ staArr: 1013
\ No newline at end of file
--
Gitblit v1.9.1