From bdbc278b097cdae0b337b2316ab555bc67e2ee34 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 12 十二月 2022 11:17:11 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 176 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 137 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1d1b9ac..26d6567 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,10 +8,11 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=ynasrs
- # url: jdbc:sqlserver://localhost:1433;databasename=ynasrs
+# url: jdbc:sqlserver://47.97.1.152:51433;databasename=ynasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=ynasrs
username: sa
- password: Zoneyung@zy56$
+# password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -35,62 +36,118 @@
enable: false
wms:
- url: 10.10.10.238:8080/xgmwms
-# url: localhost:8082/xgmwms
+ url: localhost:8081/ynwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
+ doubleLocs: 32
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
+ # 绌挎杞﹂�氶亾搴撲綅
+ channel: '0200201'
# 鍫嗗灈鏈�1
crn[0]:
id: 1
ip: 10.10.10.10
- port: 8888
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 105
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ 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: 100
- row: 2
+ staNo: 111
+ row: 17
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
+ staNo: 114
+ row: 18
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ 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: 119
+ row: 32
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 117
+ row: 30
bay: 1
lev: 1
# 绌挎杞�1
ste[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.10.10.60
port: 502
rack: 0
slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- demo: false
- # 绌挎杞﹀叆搴撶珯鐐�
- steInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
- bay: 1
- lev: 1
- # 绌挎杞﹀嚭搴撶珯鐐�
- steOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
- bay: 1
- lev: 1
+ # 绌挎杞�2
+ ste[1]:
+ id: 2
+ ip: 10.10.10.61
+ port: 502
+ rack: 0
+ slot: 0
+ # 绌挎杞�3
+ ste[2]:
+ id: 3
+ ip: 10.10.10.62
+ port: 502
+ rack: 0
+ slot: 0
+ # 绌挎杞�3
+ ste[3]:
+ id: 4
+ ip: 10.10.10.63
+ port: 502
+ rack: 0
+ slot: 0
+ # 绌挎杞�3
+ ste[4]:
+ id: 5
+ ip: 10.10.10.64
+ port: 502
+ rack: 0
+ slot: 0
# 杈撻�佺嚎
devp[0]:
id: 1
@@ -100,30 +157,71 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 102
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 102
+ 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: 176
+ staNo: 101
+ # 鎷ｆ枡鍑哄簱鍙�
+ pickInSta[0]:
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 102
+ led: ${wcs-slave.led[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.51
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.54
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
+ staArr: 102
+ # LED1
+ led[1]:
+ id: 1
+ ip: 10.10.10.207
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 100
+ # LED1
+ led[2]:
+ id: 1
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 101
+ # LED1
+ led[3]:
+ id: 2
+ ip: 10.10.10.208
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 200
--
Gitblit v1.9.1