From ce6cc529140f62ff56974ac0db49186dcbb63698 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 13 六月 2024 16:53:36 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8569c31..888f0fc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,18 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
+# url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs
+# username: sa
+# password: sa@123
+ url: jdbc:sqlserver://127.0.0.1:49977;databasename=srjtasrs
username: sa
password: sa@123
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
+# username: sa
+# password: sa@123
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
+# username: sa
+# password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -36,7 +45,7 @@
enable: false
wms:
- url: localhost:8080/jtwms
+ url: 127.0.0.1:8080/jtwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -121,7 +130,7 @@
staNo: 202
row: 6
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈�3
crn[2]:
id: 3
@@ -282,6 +291,7 @@
port: 502
rack: 0
slot: 0
+ devpPlcId: ${wcs-slave.devp[0].id}
#RGV鍏ュ簱婧愮珯鐐�
rgvInSStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -310,6 +320,7 @@
port: 502
rack: 0
slot: 0
+ devpPlcId: ${wcs-slave.devp[0].id}
#RGV鍏ュ簱婧愮珯鐐�
rgvInSStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -423,12 +434,12 @@
inSta[0]:
staNo: 217
barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[2].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 221
barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[2].id}
+ led: ${wcs-slave.led[1].id}
# WMS鍏ュ簱鍙�1
inWmsSta[0]:
staNo: 212
--
Gitblit v1.9.1