From 964a867a0e8a0814ecd7152a8ef1266f664a014b Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 11 十二月 2025 15:36:10 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 369 +++++++++++++++++----------------------------------
1 files changed, 125 insertions(+), 244 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7e3d605..31a00c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8088
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=lfdasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=jsxsasrs
username: sa
password: sa@123
mvc:
@@ -34,316 +34,197 @@
enable: false
wms:
- url: localhost:8080/lfdwms
+ url: 10.0.100.132:8080/gtCrnWms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 9,12,15,18
+ doubleLocs: 1,4,5,8,9,12
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.200.51.180
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 1
- bay: 1
+ staNo: 1017
+ row: 2
+ bay: 47
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2003
+ row: 3
+ bay: 47
+ lev: 2
+
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
- bay: 1
+ staNo: 1029
+ row: 3
+ bay: 47
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.111
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
+ staNo: 2003
+ row: 3
+ bay: 47
+ lev: 2
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1043
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 4
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1043
+ row: 3
bay: 1
lev: 1
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2013
+ row: 3
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2013
+ row: 3
+ bay: 1
+ lev: 2
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3013
+ row: 3
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3013
+ row: 3
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 10.200.51.189
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 0
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1021
+ row: 7
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.121
+ ip: 10.200.51.200
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 121
- row: 5
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 122
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 129
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 130
- row: 8
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
+ staNo: 1033
row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 208
- row: 13
- bay: 1
+ bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 209
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�7
- crn[6]:
- id: 7
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 214
- row: 16
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 215
- row: 17
- bay: 1
- lev: 1
+
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.200.51.47
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 109
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 117
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 109
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 117
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[2]:
- staNo: 101
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 126
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 134
- # 鍑哄簱鍙�2
- outSta[2]:
- staNo: 100
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 126
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 134
-# barcode: ${wcs-slave.barcode[0].id}
- # 杈撻�佺嚎2
+ staNo: 1001
+ backSta: 1000
+ led: ${wcs-slave.led[0].id}
+
+
devp[1]:
id: 2
- ip: 10.10.10.110
+ ip: 10.200.51.10
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 201
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 207
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 213
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 205
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 211
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 217
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
+ staNo: 1041
+ backSta: 1040
+ led: ${wcs-slave.led[3].id}
- # 鏉＄爜鎵弿浠�1
- barcode[0]:
- id: 1
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�2
- barcode[1]:
- id: 2
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�5
- barcode[4]:
- id: 5
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�6
- barcode[5]:
- id: 6
- ip: 10.10.10.52
- port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.101
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 015
+ staArr: 1001
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.102
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
\ No newline at end of file
+ staArr: 1024
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.103
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1028
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.104
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 1040,1041
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.105
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 1042
+ # LED6
+ led[5]:
+ id: 6
+ ip: 127.0.0.1
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ agvStaArr: CN01002008
--
Gitblit v1.9.1