From 2599526586d46212c48eaccba1a8cea97e14176d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 14 八月 2025 16:41:04 +0800
Subject: [PATCH] 1
---
src/main/resources/application.yml | 240 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 134 insertions(+), 106 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b688f73..dec22c3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,11 +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=xgmasrs
+ url: jdbc:sqlserver://10.10.10.247:1433;databasename=whxrasrs
username: sa
password: sa@123
mvc:
@@ -22,6 +18,13 @@
port: 6379
database: 0
# password: xltys1995
+
+ctu:
+ url: 10.10.10.200:8088
+ locSync: /api/open/loc/sync
+ sendTask: /api/open/bus/submit
+ getLoc: /api/open/loc/one
+ update: /api/open/sta/update
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
@@ -38,174 +41,199 @@
enable: false
wms:
- url: 10.10.10.238:8080/xgmwms
-# url: localhost:8082/xgmwms
+ url: 127.0.0.1:8080/whxrwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
+ doubleLocs: 1,4,5,8,9,12,13,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ ip: 10.10.10.110
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
+ staNo: 218
row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
+ staNo: 222
+ row: 1
bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 118
+ row: 2
+ bay: 42
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 122
+ row: 1
+ bay: 42
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.13
- port: 8888
+ ip: 10.10.10.120
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
+ staNo: 211
+ row: 4
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 215
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 111
+ row: 4
+ bay: 42
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 115
+ row: 3
+ bay: 42
+ lev: 1
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.10.10.130
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 0
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 204
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
+ staNo: 208
+ row: 5
bay: 1
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.16
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 104
- row: 10
- bay: 1
+ row: 6
+ bay: 42
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.19
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- 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]:
+ crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 108
- row: 18
- bay: 1
+ row: 5
+ bay: 42
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 19
- bay: 1
- lev: 1
- # 杈撻�佺嚎
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.191
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 1007
barcode: ${wcs-slave.barcode[0].id}
- inSta[1]:
- staNo: 180
- barcode: ${wcs-slave.barcode[1].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 176
+ backSta: 1007
+ led: ${wcs-slave.led[0].id}
+# # 鍏ュ簱鍙�1
+# inSta[1]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 200
+# led: ${wcs-slave.led[1].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 101
+# barcode: ${wcs-slave.barcode[0].id}
+# led: ${wcs-slave.led[0].id}
+# backSta: 100
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[1]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# backSta: 200
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 101
+# barcode: ${wcs-slave.barcode[0].id}
+# backSta: 100
+# led: ${wcs-slave.led[0].id}
+# # 绌烘澘鍏ュ簱鍙�2
+# emptyInSta[1]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 200
+# led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 173
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 182
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 176
- barcode: ${wcs-slave.barcode[0].id}
- # 鏉＄爜鎵弿浠�
+ staNo: 1001
+# outSta[1]:
+# staNo: 223
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.194
port: 51236
+ # 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.53
+ ip: 10.10.10.146
port: 51236
- # LED1
+ # LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 10.10.10.101
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 172
+ 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
+ staArr: 200
--
Gitblit v1.9.1