From 398a0ea330d94bc4df491dd43d7a98662c6a5157 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 06 三月 2023 14:26:23 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 185 +++++++++++++++++++---------------------------
1 files changed, 77 insertions(+), 108 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b9a815c..de0495a 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://47.97.1.152:51433;databasename=xgmasrs
- url: jdbc:sqlserver://localhost:1433;databasename=klsasrs2
+ url: jdbc:sqlserver://localhost:1433;databasename=htasrs3
username: sa
password: sa@123
mvc:
@@ -35,116 +34,122 @@
enable: false
wms:
- url: localhost:8080/klswms
+ url: localhost:8081/htwms3
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+# 1,4,5,8,9,12,13,16
+ doubleLocs:
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
+ ip: 10.10.10.3
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 3
+ staNo: 106
+ row: 2
bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 209
+ row: 2
+ bay: 41
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 2
+ staNo: 105
+ row: 1
bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 210
+ row: 1
+ bay: 41
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.13
- port: 8888
+ ip: 10.10.10.10
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.16
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 110
- row: 10
+ row: 4
bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 205
+ row: 4
+ bay: 41
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 109
+ row: 3
+ bay: 1
+ lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 206
+ row: 3
+ bay: 41
lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.30
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 104
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ scale: ${wcs-slave.scale[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ scale: ${wcs-slave.scale[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 104
+ staNo: 101
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 201
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 101
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 104
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 108
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 112
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 114
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 103
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 203
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -154,49 +159,13 @@
id: 2
ip: 10.10.10.52
port: 51236
- barcode[2]:
- id: 3
- ip: 10.10.10.52
- port: 51236
- # LED1
- led[0]:
+ # 纾呯Г
+ scale[0]:
id: 1
- ip: 10.10.10.60
+ ip: 10.10.10.201
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
- # LED2
- led[1]:
+ # 纾呯Г
+ scale[1]:
id: 2
- ip: 10.10.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 124
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 131
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
- # LED6
- led[5]:
- id: 5
- ip: 10.10.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
\ No newline at end of file
+ ip: 10.10.10.202
+ port: 5005
\ No newline at end of file
--
Gitblit v1.9.1