From 58de9685304b936c32807b167af2271d987cc23d Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 02 二月 2023 18:09:12 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 204 +++++++++++++++++++++++++++++---------------------
1 files changed, 118 insertions(+), 86 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 65187d2..015bf98 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,11 +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
- # username: sa
- # password: Zoneyung@zy56$
- url: jdbc:sqlserver://10.10.10.238:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
username: sa
+ # password: Zoneyung@zy56$
password: sa@123
mvc:
static-path-pattern: /**
@@ -37,13 +36,12 @@
enable: false
wms:
- # url: 10.10.10.238:8080/xgmwms
- url: localhost:8082/xgmwms
+ url: 10.10.10.200:8081/bfwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
doubleLocs: 1,4,5,8,9,12,13,16,17,20
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
@@ -52,151 +50,185 @@
crn[0]:
id: 1
ip: 10.10.10.10
- port: 8888
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
- bay: 1
+ staNo: 107
+ row: 4
+ bay: 4
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
- bay: 1
+ staNo: 108
+ row: 4
+ bay: 5
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.13
- port: 8888
+ ip: 10.10.10.20
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 6
- bay: 1
+ staNo: 111
+ row: 11
+ bay: 5
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 211
+ row: 12
+ bay: 5
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
- bay: 1
+ staNo: 104
+ row: 11
+ bay: 4
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 204
+ row: 12
+ bay: 4
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.16
- port: 8888
+ ip: 10.10.10.30
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.19
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 15
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.22
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
+ staNo: 207
row: 18
- bay: 1
+ bay: 4
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 19
- bay: 1
+ staNo: 208
+ row: 18
+ bay: 5
lev: 1
+ # 绌挎杞�1
+ ste[0]:
+ id: 1
+ ip: 10.10.10.40
+ port: 502
+ rack: 0
+ slot: 0
+ # 绌挎杞�2
+ ste[1]:
+ id: 2
+ ip: 10.10.10.41
+ port: 502
+ rack: 0
+ slot: 0
+ # 绌挎杞�3
+ ste[2]:
+ id: 3
+ ip: 10.10.10.42
+ port: 502
+ rack: 0
+ slot: 0
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.61
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 103
+ barcode: ${wcs-slave.barcode[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 173
+ staNo: 100
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 182
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 172
+ staNo: 200
+ # 鎷ｆ枡鍑哄簱鍙�
+ pickOutSta[0]:
+ staNo: 300
+ # 鎷ｆ枡鍑哄簱鍙�
+ pickInSta[0]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍑哄簱鍙�
+ pickInSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[2].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
ip: 10.10.10.52
port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.53
+ port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 173
- # LED2
+ staArr: 100
+ # LED1
led[1]:
id: 2
- ip: 10.10.10.61
+ ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
\ No newline at end of file
+ staArr: 300
+ # LED1
+ led[2]:
+ id: 3
+ ip: 10.10.10.207
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 200
--
Gitblit v1.9.1