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 | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 017f96a..5a37a8c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1: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:8084/xgmFlwms
+ url: 192.168.11.30:8080/xgmFlwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -52,7 +52,7 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
- offset: 1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
@@ -90,7 +90,7 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
@@ -128,7 +128,7 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
@@ -149,14 +149,14 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 104
row: 6
- bay: 41
+ bay: 42
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 108
row: 5
- bay: 41
+ bay: 42
lev: 1
# 杈撻�佺嚎1
devp[0]:
--
Gitblit v1.9.1