From cec95e176a9cfaa7661883f66dcebcc98a8b6449 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 10 十月 2025 10:14:32 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 115 +++++++++++++--------------------------------------------
1 files changed, 27 insertions(+), 88 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eed7e75..14c8ee3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 9092
servlet:
context-path: /@pom.build.finalName@
@@ -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://192.168.4.15:1433;databasename=xgmasrs
-# url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://178.18.1.201:1433;databasename=jxtlfasrs-yclk
username: sa
password: sa@123
mvc:
@@ -38,136 +34,79 @@
enable: false
wms:
- url: localhost:8080/xgmwms
-# url: localhost:8082/xgmwms
-
-#鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃緭閫佹湁鍏ュ簱浠诲姟锛屽彨鍥炲師鐐�
-crnBackHp:
- enable: false
+ url: 127.0.0.1:8082/clwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12
+ doubleLocs: 1,4
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
+ ip: 178.18.1.130
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
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
+ row: 2
+ bay: 18
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.13
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 103
- row: 7
- bay: 1
+ row: 2
+ bay: 19
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.16
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 11
- bay: 1
- lev: 1
-
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 178.18.1.140
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 180
- barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 101
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 173
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 182
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 102
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 176
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 10.10.10.52
- port: 51236
- barcode[1]:
- id: 2
- ip: 10.10.10.53
+ ip: 10.10.10.105
port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 178.18.1.27
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 172
+ staArr: 101
# LED2
led[1]:
id: 2
- ip: 10.10.10.61
+ ip: 178.18.1.26
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
+ staArr: 102
--
Gitblit v1.9.1