From 3677c6501ed94234f406d6444bab46e90824dac8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 24 二月 2025 09:58:16 +0800
Subject: [PATCH] *
---
src/main/resources/application.yml | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7da3fae..49d5378 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:50948;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,8 @@
enable: false
wms:
- url: localhost:8080/hswms
+ url: 192.168.18.4:8080/jtwms
+ rgvOpen: false
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -121,7 +131,7 @@
staNo: 202
row: 6
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈�3
crn[2]:
id: 3
@@ -282,6 +292,7 @@
port: 502
rack: 0
slot: 0
+ devpPlcId: ${wcs-slave.devp[0].id}
#RGV鍏ュ簱婧愮珯鐐�
rgvInSStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -310,6 +321,7 @@
port: 502
rack: 0
slot: 0
+ devpPlcId: ${wcs-slave.devp[0].id}
#RGV鍏ュ簱婧愮珯鐐�
rgvInSStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -339,15 +351,24 @@
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 122
# WMS鍏ュ簱鍙�1
inWmsSta[0]:
staNo: 145
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 122
+ # 鎷嗗灈鍙犵洏鍙�1
+ emptyInSta2[0]:
+ staNo: 118
+ # 鎷嗗灈鍙犵洏鍙�2
+ emptyInSta2[1]:
+ staNo: 119
+ # 鎷嗗灈鍙犵洏鍙�3
+ emptyInSta2[2]:
+ staNo: 120
+ # 鎷嗗灈鍙犵洏鍙�4
+ emptyInSta2[3]:
+ staNo: 121
# 鍑哄簱鍙�1
outSta[0]:
staNo: 122
@@ -366,6 +387,9 @@
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 122
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 171
# Rgv鍑哄簱鍙�1
outRgvSta[0]:
staNo: 102
@@ -402,6 +426,9 @@
# Rgv鍏ュ簱鍙�1
inRgvSta[5]:
staNo: 123
+ # Rgv鍏ュ簱鍙�1
+ inRgvSta[6]:
+ staNo: 171
# 杈撻�佺嚎
devp[1]:
@@ -414,10 +441,12 @@
inSta[0]:
staNo: 217
barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[2].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 221
barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
# WMS鍏ュ簱鍙�1
inWmsSta[0]:
staNo: 212
@@ -480,11 +509,11 @@
ip: 192.168.18.6
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 217
+ staArr: 221
# LED3
led[2]:
id: 3
ip: 192.168.18.7
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 221
\ No newline at end of file
+ staArr: 217
\ No newline at end of file
--
Gitblit v1.9.1