From b143fe586d7be6c12ec162bf5aebb3a99bff7e32 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 08:48:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/resources/application.yml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 00fc217..5db0b6b 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=zjfnasrs
+ url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
username: sa
password: sa@123
mvc:
@@ -68,6 +68,13 @@
row: 2
bay: 0
lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1000
+ row: 1
+ bay: 25
+ lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
@@ -96,7 +103,7 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.12.55.90
port: 102
rack: 0
slot: 0
@@ -123,6 +130,9 @@
# 鍑哄簱鍙�3
outSta[2]:
staNo: 205
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 1000
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
--
Gitblit v1.9.1