From c471b38363268108200e6c88c87fc219d17eb17f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 26 十一月 2024 13:13:58 +0800
Subject: [PATCH] 项目搭建完成
---
src/main/resources/application.yml | 267 +++++++++++-----------------------------------------
1 files changed, 58 insertions(+), 209 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 874489d..68edfc1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9091
+ port: 9090
servlet:
context-path: /@pom.build.finalName@
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=gdykasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsjasrs
username: sa
password: sa@123
mvc:
@@ -34,19 +34,44 @@
enable: false
wms:
- url: 127.0.0.1:8080/ykwms
+ url: 127.0.0.1:8080/jsjwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
+
# 鍫嗗灈鏈�1
crn[0]:
id: 1
+ ip: 10.10.10.1
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
ip: 10.10.10.10
port: 102
rack: 0
@@ -57,221 +82,56 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 123
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
- 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: 127
+ staNo: 105
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 131
+ staNo: 107
row: 7
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: 135
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 139
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.40
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 144
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 148
- row: 15
- bay: 1
- lev: 1
- # RGV绌挎杞�1
- rgv[0]:
- id: 1
- ip: 10.10.10.60
- port: 502
- rack: 0
- slot: 0
- #RGV鍏ュ簱婧愮珯鐐�
- rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- #RGV鍑哄簱婧愮珯鐐�
- rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- #RGV鐩爣绔欑偣
- rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- # RGV绌挎杞�2
- rgv[1]:
- id: 2
- ip: 10.10.10.63
- port: 502
- rack: 0
- slot: 0
- #RGV鍏ュ簱婧愮珯鐐�
- rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- #RGV鍑哄簱婧愮珯鐐�
- rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- #RGV鐩爣绔欑偣
- rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- # RGV绌挎杞�2
-# rgv[2]:
-# id: 3
-# ip: 10.10.10.66
-# port: 502
-# rack: 0
-# slot: 0
-# #RGV鍏ュ簱婧愮珯鐐�
-# rgvInSStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 100
-# rgvInSStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 101
-# #RGV鍑哄簱婧愮珯鐐�
-# rgvOutSStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 110
-# rgvOutSStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 112
-# #RGV鐩爣绔欑偣
-# rgvDestStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 102
-# rgvDestStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 103
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.18
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 106
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ backSta: 102
led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 104
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 106
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ backSta: 102
led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- backSta: 105
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 107
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
- led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 107
+ staNo: 105
barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
- led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[1]:
- staNo: 107
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- backSta: 108
+ backSta: 104
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 106
+ led: ${wcs-slave.led[3].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
@@ -283,43 +143,32 @@
id: 2
ip: 10.10.10.122
port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.123
- port: 51236
- # LED1
+
+ # LED1
led[0]:
id: 1
- ip: 10.10.10.249
+ ip: 10.10.10.190
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.248
+ ip: 10.10.10.191
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 106
+ staArr: 102,103
# LED3
led[2]:
id: 3
- ip: 10.10.10.247
+ ip: 10.10.10.192
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 107
+ staArr: 104,105
# LED4
led[3]:
id: 4
- ip: 10.10.10.246
+ ip: 10.10.10.192
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 126
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.245
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 134
\ No newline at end of file
+ staArr: 106
\ No newline at end of file
--
Gitblit v1.9.1