From d2a6ee475f0c354b5fedfd0698889cca057f5280 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期日, 13 七月 2025 16:16:10 +0800
Subject: [PATCH] *
---
src/main/resources/application.yml | 98 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 477b377..aabb667 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,21 @@
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://192.168.4.191:50948;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,14 +48,15 @@
enable: false
wms:
- url: localhost:8080/hswms
+ url: 192.168.18.4:8080/jtwms
+ rgvOpen: false
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -121,7 +134,7 @@
staNo: 202
row: 6
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈�3
crn[2]:
id: 3
@@ -282,6 +295,7 @@
port: 502
rack: 0
slot: 0
+ devpPlcId: ${wcs-slave.devp[0].id}
#RGV鍏ュ簱婧愮珯鐐�
rgvInSStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -310,6 +324,7 @@
port: 502
rack: 0
slot: 0
+ devpPlcId: ${wcs-slave.devp[0].id}
#RGV鍏ュ簱婧愮珯鐐�
rgvInSStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -339,20 +354,45 @@
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 15
- barcode: ${wcs-slave.barcode[0].id}
+ # WMS鍏ュ簱鍙�1
+ inWmsSta[0]:
+ staNo: 145
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 12
+ 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: 11
+ staNo: 122
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta2[0]:
+ staNo: 118
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta2[1]:
+ staNo: 119
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta2[2]:
+ staNo: 120
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta2[3]:
+ staNo: 121
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 11
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 122
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 171
# Rgv鍑哄簱鍙�1
outRgvSta[0]:
staNo: 102
@@ -389,6 +429,9 @@
# Rgv鍏ュ簱鍙�1
inRgvSta[5]:
staNo: 123
+ # Rgv鍏ュ簱鍙�1
+ inRgvSta[6]:
+ staNo: 171
# 杈撻�佺嚎
devp[1]:
@@ -401,10 +444,15 @@
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
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 212
@@ -417,7 +465,14 @@
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 212
- barcode: ${wcs-slave.barcode[0].id}
+ # 2妤肩爜鍨涗綅缃�
+ driveSta[0]:
+ staNo: 215
+ barcode: ${wcs-slave.barcode[3].id}
+ # 2妤肩爜鍨涗綅缃�
+ driveSta[1]:
+ staNo: 219
+ barcode: ${wcs-slave.barcode[4].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
@@ -447,14 +502,21 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 192.168.18.5
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 15
+ staArr: 144
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 192.168.18.6
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 11
\ No newline at end of file
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 221
+ # LED3
+ led[2]:
+ id: 3
+ ip: 192.168.18.7
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 217
\ No newline at end of file
--
Gitblit v1.9.1