From 5d2dbd0b53528b36899943c729a76963ccc6fc76 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 10 三月 2022 17:04:53 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 112 +++++++++----------------------------------------------
1 files changed, 19 insertions(+), 93 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 65187d2..e9d33bf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,10 +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
- # username: sa
- # password: Zoneyung@zy56$
- url: jdbc:sqlserver://10.10.10.238:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
username: sa
password: sa@123
mvc:
@@ -37,8 +34,8 @@
enable: false
wms:
- # url: 10.10.10.238:8080/xgmwms
- url: localhost:8082/xgmwms
+ url: 10.10.10.238:8080/xgmwms
+# url: localhost:8082/xgmwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -70,92 +67,27 @@
row: 3
bay: 1
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.13
+ # 绌挎杞�1
+ ste[0]:
+ id: 1
+ ip: 10.10.10.10
port: 8888
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ # 绌挎杞﹀叆搴撶珯鐐�
+ steInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 6
+ staNo: 100
+ row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ # 绌挎杞﹀嚭搴撶珯鐐�
+ steOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
- 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: 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
+ staNo: 101
+ row: 3
bay: 1
lev: 1
# 杈撻�佺嚎
@@ -180,7 +112,8 @@
staNo: 182
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 172
+ staNo: 176
+ barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -193,10 +126,3 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 173
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
\ No newline at end of file
--
Gitblit v1.9.1