From 58de9685304b936c32807b167af2271d987cc23d Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 02 二月 2023 18:09:12 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 21d67be..015bf98 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://47.97.1.152:51433;databasename=bfasrs
- url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+ url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
@@ -36,7 +36,7 @@
enable: false
wms:
- url: localhost:8081/bfmwms
+ url: 10.10.10.200:8081/bfwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -164,25 +164,43 @@
inSta[0]:
staNo: 103
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 203
barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 103
+ barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
# 鍑哄簱鍙�2
outSta[1]:
staNo: 200
- # 鎷f枡鍏ュ簱鍙�
- pickSta[0]:
+ # 鎷f枡鍑哄簱鍙�
+ pickOutSta[0]:
staNo: 300
+ # 鎷f枡鍑哄簱鍙�
+ pickInSta[0]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
+ led: ${wcs-slave.led[0].id}
+ # 鎷f枡鍑哄簱鍙�
+ pickInSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[2].id}
# 鏉$爜鎵弿浠�
barcode[0]:
id: 1
@@ -196,7 +214,21 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 173
+ staArr: 100
+ # LED1
+ led[1]:
+ id: 2
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 300
+ # LED1
+ led[2]:
+ id: 3
+ ip: 10.10.10.207
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 200
--
Gitblit v1.9.1