From 02fcf6d4c840b6b6c279976147ad5dfd8aebb401 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 09 十一月 2023 14:12:40 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 316 ++++++++++------------------------------------------
1 files changed, 62 insertions(+), 254 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 30009b9..1ebdf02 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=xcjgasrs
username: sa
password: sa@123
mvc:
@@ -35,152 +34,96 @@
enable: false
wms:
- url: localhost:8080/nbjfwms
+ url: localhost:8080/xcjgwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�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
- row: 2
- bay: 2
+ row: 1
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- row: 2
- bay: 55
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 105
+ row: 1
+ bay: 1
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
+ row: 1
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- row: 2
- bay: 55
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 105
+ row: 1
+ bay: 1
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: 10.10.10.111
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1
+ # 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 7
- bay: 2
- lev: 1
+ staNo: 102
+ row: 1
+ bay: 1
+ lev: 5
# 鍫嗗灈鏈哄叆搴撶珯鐐�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
+ staNo: 105
+ row: 1
+ bay: 1
+ lev: 5
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 7
- bay: 2
- lev: 1
+ staNo: 102
+ row: 1
+ bay: 1
+ lev: 5
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 116
- row: 7
- bay: 55
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 105
+ row: 1
+ bay: 26
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
@@ -188,216 +131,81 @@
inSta[0]:
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 101
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 111
+ staNo: 201
barcode: ${wcs-slave.barcode[1].id}
+ backSta: 201
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 101
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 111
+ staNo: 201
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
+ staNo: 104
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 110
+ staNo: 205
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 101
+ led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 111
+ staNo: 201
barcode: ${wcs-slave.barcode[1].id}
+ backSta: 201
+ led: ${wcs-slave.led[1].id}
+
# 杈撻�佺嚎2
devp[1]:
id: 2
- ip: 10.10.10.90
+ ip: 10.10.10.51
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
+ staNo: 305
# 绌烘澘鍏ュ簱鍙�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
+ staNo: 400
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 103
+ staNo: 305
# 鍑哄簱鍙�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}
-
+ staNo: 400
# 鏉＄爜鎵弿浠�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.4
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
+ ip: 10.10.10.205
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
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
+ staArr: 103
\ No newline at end of file
--
Gitblit v1.9.1