From f7cd48fedbf67b331e1781235ec6f62386217a1a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 13 二月 2023 13:46:13 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 371 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 277 insertions(+), 94 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 96fa0e0..30009b9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,10 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=nbjfasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -33,6 +34,9 @@
swagger:
enable: false
+wms:
+ url: localhost:8080/nbjfwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
@@ -44,177 +48,356 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
+ ip: 10.10.10.101
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 205
+ staNo: 102
row: 2
- bay: 65
+ bay: 2
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 112
row: 2
- bay: 0
+ 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: 203
- row: 3
- bay: 65
+ staNo: 102
+ row: 2
+ bay: 2
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
- row: 3
- bay: 0
+ 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
- ip: 192.168.10.20
+ ip: 10.10.10.111
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 6
- bay: 65
+ staNo: 106
+ row: 7
+ bay: 2
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 124
- row: 6
- bay: 0
+ 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: 200
+ staNo: 106
row: 7
- bay: 65
+ bay: 2
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 116
row: 7
- bay: 0
+ 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: 192.168.10.100
+ ip: 10.10.10.97
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 301
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
-# # 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 202
-# barcode: ${wcs-slave.barcode[1].id}
+ # 鍏ュ簱鍙�2
inSta[1]:
- staNo: 110
+ staNo: 111
+ barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 301
+ staNo: 101
# 绌烘澘鍏ュ簱鍙�2
-# emptyInSta[1]:
-# staNo: 202
- # 绌烘澘鍏ュ簱鍙�3
emptyInSta[1]:
- staNo: 126
+ staNo: 111
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 200
+ staNo: 100
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 203
+ staNo: 110
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 101
+ 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: 103
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 200
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 203
+ # 鍑哄簱鍙�5
+ outSta[4]:
+ staNo: 300
+ # 鍑哄簱鍙�6
+ outSta[5]:
+ staNo: 303
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 127
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 104
+ barcode: ${wcs-slave.barcode[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 128
- # 鏉＄爜鎵弿浠�
+ 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}
+
+
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 192.168.10.130
+ ip: 10.10.10.100
port: 51236
-# # 鏉＄爜鎵弿浠�
-# barcode[1]:
-# id: 2
-# ip: 192.168.10.131
-# port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.101
+ 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: 192.168.10.211
+ ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 113
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 192.168.10.221
+ ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109
+ staArr: 110
# LED3
led[2]:
id: 3
- ip: 192.168.10.231
+ ip: 10.10.10.203
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 103
# LED4
led[3]:
id: 4
- ip: 192.168.10.231
+ ip: 10.10.10.204
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 129
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.10.135
- port: 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 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
+ 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
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 300
+ # LED8
+ led[7]:
+ id: 8
+ ip: 10.10.10.208
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 303
\ No newline at end of file
--
Gitblit v1.9.1