From 5e61001f8678d26ffdf230e640b32c3632220d58 Mon Sep 17 00:00:00 2001
From: ZY <zc>
Date: 星期二, 05 八月 2025 10:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs
---
src/main/resources/application.yml | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a37b1ea..5a37a8c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9093
+ port: 9090
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=xgmFlasrs
+ url: jdbc:sqlserver://192.168.11.30:1433;databasename=xgmFlasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 127.0.0.1:8080/xgmFlwms
+ url: 192.168.11.30:8080/xgmFlwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -43,7 +43,7 @@
# 鍙屾繁搴撲綅鎺掑彿
doubleLocs: 1,4,5,8,9,12,13,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
@@ -52,35 +52,35 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
- offset: 1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 1
+ staNo: 218
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
+ staNo: 222
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 204
- row: 1
- bay: 41
+ staNo: 118
+ row: 2
+ bay: 42
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 208
- row: 2
- bay: 41
+ staNo: 122
+ row: 1
+ bay: 42
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
@@ -90,35 +90,35 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 3
+ staNo: 211
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 111
- row: 4
+ staNo: 215
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 211
- row: 3
- bay: 41
+ staNo: 111
+ row: 4
+ bay: 42
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 215
- row: 4
- bay: 41
+ staNo: 115
+ row: 3
+ bay: 42
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
@@ -128,35 +128,35 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
- row: 5
+ staNo: 204
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 116
- row: 6
+ staNo: 208
+ row: 5
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 218
- row: 5
- bay: 41
+ staNo: 104
+ row: 6
+ bay: 42
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 222
- row: 6
- bay: 41
+ staNo: 108
+ row: 5
+ bay: 42
lev: 1
# 杈撻�佺嚎1
devp[0]:
@@ -203,18 +203,18 @@
led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 117
+ staNo: 123
outSta[1]:
staNo: 223
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.121
+ ip: 10.10.10.143
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 10.10.10.146
port: 51236
# LED1
led[0]:
@@ -229,4 +229,4 @@
ip: 10.10.10.102
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 106
+ staArr: 200
--
Gitblit v1.9.1