From 6ba157825d34078a75fee36cb66ead17327f5b32 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 29 四月 2025 14:32:55 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 285 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 223 insertions(+), 62 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 65187d2..4629c92 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -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=gdykasrs
username: sa
password: sa@123
mvc:
@@ -37,128 +34,200 @@
enable: false
wms:
- # url: 10.10.10.238:8080/xgmwms
- url: localhost:8082/xgmwms
+ url: 127.0.0.1:9090/ykwms
+inventory:
+ number: 7
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
+ doubleLocs: 1,4,5,8,9,12,13,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
ip: 10.10.10.10
- port: 8888
+ 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: 123
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
+ staNo: 118
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.13
- port: 8888
+ 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: 102
- row: 6
+ staNo: 131
+ row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
+ staNo: 127
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.16
- port: 8888
+ 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: 104
+ staNo: 135
row: 10
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
+ staNo: 139
row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 10.10.10.19
- port: 8888
+ 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: 106
+ staNo: 144
row: 14
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
+ staNo: 148
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]:
+
+ # 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: 108
- row: 18
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ staNo: 100
+ rgvInSStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 19
- bay: 1
- lev: 1
- # 杈撻�佺嚎
+ 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
@@ -167,36 +236,128 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 106
barcode: ${wcs-slave.barcode[0].id}
+ barcodeMat: ${wcs-slave.barcode[3].id}
+ backSta: 105
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 106
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 105
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 159
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 160
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[1].id}
+ barcodeMat: ${wcs-slave.barcode[4].id}
+ backSta: 108
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 108
+ led: ${wcs-slave.led[2].id}
+ inSta[2]:
+ staNo: 159
+ barcode: ${wcs-slave.barcode[2].id}
+ barcodeMat: ${wcs-slave.barcode[5].id}
+ backSta: 160
+ led: ${wcs-slave.led[5].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[1]:
+# staNo: 107
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# backSta: 108
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 173
- # 鍑哄簱鍙�2
+ staNo: 100
+ led: ${wcs-slave.led[0].id}
outSta[1]:
- staNo: 182
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 172
- # 鏉＄爜鎵弿浠�
+ staNo: 152
+ led: ${wcs-slave.led[3].id}
+ outSta[2]:
+ staNo: 156
+ led: ${wcs-slave.led[4].id}
+
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.121
+ port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.122
+ port: 51236
+ # 鏉＄爜鎵弿浠�3
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.123
+ port: 51236
+ # 鏉＄爜鎵弿浠�1mat
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.121
+ port: 51236
+ # 鏉＄爜鎵弿浠�2mat
+ barcode[4]:
+ id: 5
+ ip: 10.10.10.122
+ port: 51236
+ # 鏉＄爜鎵弿浠�3mat
+ barcode[5]:
+ id: 6
+ ip: 10.10.10.123
port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 10.10.10.101
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 173
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.61
+ ip: 10.10.10.102
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
\ No newline at end of file
+ staArr: 106
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.103
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 107
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.104
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 152
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.105
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 156
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.10.106
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 160,159
\ No newline at end of file
--
Gitblit v1.9.1