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 | 173 ++++++++++++++++++++-------------------------------------
1 files changed, 62 insertions(+), 111 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 96fa0e0..de0495a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,9 @@
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=htasrs3
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -33,188 +33,139 @@
swagger:
enable: false
+wms:
+ url: localhost:8081/htwms3
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+# 1,4,5,8,9,12,13,16
+ doubleLocs:
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
+ ip: 10.10.10.3
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: 106
row: 2
- bay: 65
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
+ staNo: 209
row: 2
- bay: 0
+ bay: 41
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 3
- bay: 65
+ staNo: 105
+ row: 1
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
- row: 3
- bay: 0
+ staNo: 210
+ row: 1
+ bay: 41
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.10.20
+ ip: 10.10.10.10
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 6
- bay: 65
+ staNo: 110
+ row: 4
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 124
- row: 6
- bay: 0
+ staNo: 205
+ row: 4
+ bay: 41
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
- row: 7
- bay: 65
+ staNo: 109
+ row: 3
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 7
- bay: 0
+ staNo: 206
+ row: 3
+ bay: 41
lev: 1
+
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.10.100
+ ip: 10.10.10.30
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}
+ scale: ${wcs-slave.scale[0].id}
+ # 鍏ュ簱鍙�2
inSta[1]:
- staNo: 110
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ scale: ${wcs-slave.scale[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 301
+ staNo: 101
# 绌烘澘鍏ュ簱鍙�2
-# emptyInSta[1]:
-# staNo: 202
- # 绌烘澘鍏ュ簱鍙�3
emptyInSta[1]:
- staNo: 126
+ staNo: 201
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 200
+ staNo: 103
# 鍑哄簱鍙�2
outSta[1]:
staNo: 203
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 103
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 127
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[1]:
- staNo: 128
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.10.130
+ ip: 10.10.10.52
port: 51236
-# # 鏉＄爜鎵弿浠�
-# barcode[1]:
-# id: 2
-# ip: 192.168.10.131
-# port: 51236
- # LED1
- led[0]:
- id: 1
- ip: 192.168.10.211
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 113
- # LED2
- led[1]:
+ barcode[1]:
id: 2
- ip: 192.168.10.221
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109
- # LED3
- led[2]:
- id: 3
- ip: 192.168.10.231
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
- # LED4
- led[3]:
- id: 4
- ip: 192.168.10.231
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 129
- # 纾呯О
+ ip: 10.10.10.52
+ port: 51236
+ # 纾呯Г
scale[0]:
id: 1
- ip: 192.168.10.135
- port: 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ip: 10.10.10.201
+ port: 5005
+ # 纾呯Г
+ scale[1]:
+ id: 2
+ ip: 10.10.10.202
+ port: 5005
\ No newline at end of file
--
Gitblit v1.9.1