From 48302c5c7f85bfdd52dfd071d7a9ef8628d87667 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 三月 2024 16:45:29 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 206 ++++++++++++++++++++++++---------------------------
1 files changed, 97 insertions(+), 109 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 620400c..f6ed368 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ahyxasrs
username: sa
password: sa@123
mvc:
@@ -36,20 +36,20 @@
enable: false
wms:
- url: localhost:8080/hswms
+ url: localhost:8080/yxwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -59,21 +59,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 007
- row: 3
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 008
- row: 2
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.4.250
+ ip: 10.10.10.130
port: 102
rack: 0
slot: 0
@@ -83,21 +85,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 005
- row: 7
+ staNo: 145
+ staNoOther: 144
+ row: 8
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 006
- row: 6
+ staNo: 148
+ staNoOther: 149
+ row: 5
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.4.250
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -107,21 +111,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 003
- row: 11
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 004
- row: 10
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 192.168.4.250
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -131,21 +137,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 001
- row: 15
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 002
- row: 14
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈�5
crn[4]:
id: 5
- ip: 192.168.4.250
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -155,21 +163,23 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 001
- row: 15
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 002
- row: 14
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈�6
crn[5]:
id: 6
- ip: 192.168.4.250
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -179,50 +189,49 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 001
- row: 15
+ staNo: 153
+ staNoOther: 152
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 002
- row: 14
+ staNo: 100
+ staNoOther: 101
+ row: 1
bay: 1
lev: 1
-
+ # 鍫嗗灈鏈�7
+ crn[6]:
+ id: 7
+ ip: 10.10.10.120
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 153
+ staNoOther: 152
+ row: 4
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 100
+ staNoOther: 101
+ row: 1
+ bay: 1
+ lev: 1
# RGV绌挎杞�1
rgv[0]:
id: 1
- ip: 10.10.10.40
- 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: 192.168.4.15
+ ip: 192.168.18.77
port: 502
rack: 0
slot: 0
@@ -251,45 +260,31 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 15
- barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 12
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 11
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 11
- barcode: ${wcs-slave.barcode[0].id}
- # 杈撻�佺嚎
- devp[1]:
- id: 2
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 15
- barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 12
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 11
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 11
- barcode: ${wcs-slave.barcode[0].id}
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ singleSta[0]:
+ staNo: 153
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�2
+ singleSta[1]:
+ staNo: 145
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inSingleSta[0]:
+ staNo: 174
+ # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+ emptyInSingleSta[0]:
+ staNo: 104
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inLargeSta[0]:
+ staNo: 153
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
+ inLargeSta[1]:
+ staNo: 145
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+ emptyInLargeSta[0]:
+ staNo: 104
# 鏉＄爜鎵弿浠�
barcode[0]:
@@ -319,14 +314,7 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 192.168.18.5
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 15
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 11
\ No newline at end of file
+ staArr: 144
\ No newline at end of file
--
Gitblit v1.9.1