From 39acba539a8dded2d7204b66c157e9fd3b268073 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 18 七月 2025 08:18:05 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 293 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 210 insertions(+), 83 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8c59dcd..f6c4a91 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,9 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ytflasrs
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -34,182 +34,309 @@
enable: false
wms:
- url: localhost:8080/xgmwms
+ url: 127.0.0.1:8080/wms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
+ doubleLocs: 3,4,7,10,11,14,15,18,19,22,23,26
+ # 宸︽繁搴撲綅鎺掑彿
+ doubleLocsLeft: 4,7,11,15,19,23
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 3,7,10,14,18,22,26
+ # 宸︽祬搴撲綅鎺掑彿
+ shallowLocsLeft: 5,8,12,16,20,24
+ # 鍙虫祬搴撲綅鎺掑彿
+ shallowLocsRight: 2,6,9,13,17,21,25
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
+ ip: 172.17.60.10
port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 192.168.10.20
- port: 102
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
+ staNo: 1020
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
+ staNo: 1013
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1016
+ row: 5
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 172.17.60.20
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1023
+ row: 8
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1026
+ row: 9
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.10.20
+ ip: 172.17.60.30
port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 10
+ staNo: 1029
+ row: 12
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 11
+ staNo: 1032
+ row: 13
bay: 1
lev: 1
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 192.168.10.20
+ ip: 172.17.60.40
port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 14
+ staNo: 1036
+ row: 16
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 15
+ staNo: 1039
+ row: 17
bay: 1
lev: 1
# 鍫嗗灈鏈�5
crn[4]:
id: 5
- ip: 192.168.10.20
+ ip: 172.17.60.50
port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 18
+ staNo: 1042
+ row: 20
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 19
+ staNo: 1045
+ row: 21
bay: 1
lev: 1
- # 杈撻�佺嚎
- devp[0]:
- id: 1
- ip: 192.168.10.100
+ # 鍫嗗灈鏈�6
+ crn[5]:
+ id: 6
+ ip: 172.17.60.60
port: 102
rack: 0
- slot: 1
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1049
+ row: 24
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1052
+ row: 25
+ bay: 1
+ lev: 1
+ # RGV绌挎杞�1
+ rgv[0]:
+ id: 1
+ ip: 172.17.60.82
+ port: 502
+ rack: 0
+ slot: 0
+ # 杈撻�佺嚎1
+ devp[0]:
+ id: 1
+ ip: 172.17.60.100
+ port: 102
+ rack: 0
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 1009
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1008
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 1076
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1075
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 1009
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1008
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 1058
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1058
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 1064
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1064
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 170
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 180
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 176
- # 鏉＄爜鎵弿浠�
+ staNo: 102
+ led: ${wcs-slave.led[0].id}
+ # 杈撻�佺嚎2
+ devp[1]:
+ id: 2
+ ip: 172.17.60.118
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 1002
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 1001
+ led: ${wcs-slave.led[7].id}
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 192.168.10.130
+ ip: 10.10.10.121
port: 51236
- # LED1
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.121
+ port: 51236
+ # 鏉＄爜鎵弿浠�3
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.121
+ port: 51236
+ # 鏉＄爜鎵弿浠�4
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.121
+ port: 51236
+ # LED1
led[0]:
id: 1
- ip: 192.168.10.211
+ ip: 10.10.11.210
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 170
+ staArr: 1008
# LED2
led[1]:
id: 2
- ip: 192.168.10.221
+ ip: 10.10.11.210
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 180
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ staArr: 1075
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.11.210
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1058
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.11.210
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1064
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.11.210
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1068
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.11.210
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1071
+ # LED7
+ led[6]:
+ id: 7
+ ip: 10.10.11.210
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1074
+ # LED8
+ led[7]:
+ id: 8
+ ip: 10.10.11.210
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 1001
\ No newline at end of file
--
Gitblit v1.9.1