From e9cdecd287c7ab88ae4b4ad28a9f9343ed9ae23f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 13:38:26 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 237 +++++++++++++++++++++++-----------------------------------
1 files changed, 95 insertions(+), 142 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c18cd83..2d2c6e2 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://localhost:1433;databasename=xgmasrs
+ # url: jdbc:sqlserver://47.97.1.152:51433;databasename=bfasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
username: sa
+ # password: Zoneyung@zy56$
password: sa@123
mvc:
static-path-pattern: /**
@@ -37,130 +36,107 @@
enable: false
wms:
- url: localhost:8080/xgmwms
+ url: localhost:8081/bfmwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
doubleLocs: 1,4,5,8,9,12,13,16,17,20
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
- crn[0]:
+# crn[0]:
+# id: 1
+# ip: 10.10.10.10
+# port: 102
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 100
+# row: 2
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 101
+# row: 3
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈�2
+# crn[1]:
+# id: 1
+# ip: 10.10.10.20
+# port: 102
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 100
+# row: 2
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 101
+# row: 3
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈�3
+# crn[2]:
+# id: 1
+# ip: 10.10.10.30
+# port: 102
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 100
+# row: 2
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 101
+# row: 3
+# bay: 1
+# lev: 1
+ # 绌挎杞�1
+ ste[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
+ ip: 10.10.10.40
+ port: 502
+ rack: 0
+ slot: 0
+ # 绌挎杞�2
+ ste[1]:
id: 2
- ip: 10.10.10.13
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
+ ip: 10.10.10.41
+ port: 502
+ rack: 0
+ slot: 0
+ # 绌挎杞�3
+ ste[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: 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
- row: 18
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 19
- bay: 1
- lev: 1
+ 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
@@ -179,40 +155,17 @@
staNo: 182
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 172
+ staNo: 176
+ barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.10.130
+ ip: 10.10.10.52
port: 51236
- # LED1
+ # LED1
led[0]:
id: 1
- ip: 192.168.10.211
+ ip: 10.10.10.60
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 170
- # LED2
- led[1]:
- id: 2
- ip: 192.168.10.221
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 180
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ staArr: 173
--
Gitblit v1.9.1