From 3b37c4f47d9ad74a8fa0f21bdb366b3633014f76 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 26 八月 2024 16:04:32 +0800
Subject: [PATCH] 优化消防出库
---
src/main/resources/application.yml | 93 +++++++++++++++++++++++++++++++---------------
1 files changed, 62 insertions(+), 31 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6f6475b..042e374 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 9090
servlet:
context-path: /@pom.build.finalName@
@@ -8,7 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=zjfnasrs
+ url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
+ #url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +35,7 @@
enable: false
wms:
- url: localhost:8080/fnwms
+ url: 10.12.55.200:8080/fnwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -47,7 +48,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 172.28.15.210
+ ip: 10.12.55.70
port: 8888
rack: 0
slot: 0
@@ -57,62 +58,92 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 2
- bay: 1
- lev: 1
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
+ staNo: 202
row: 1
- bay: 19
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
+ staNo: 1000
row: 1
- bay: 1
+ bay: 25
lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 1
- bay: 19
- lev: 1
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
+ staNo: 203
row: 2
- bay: 19
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 10.12.55.60
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 209
+ row: 3
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 210
+ row: 4
+ bay: 0
lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 172.28.15.220
+ ip: 10.12.55.90
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 201
barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 206
+ barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
+ staNo: 201
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 206
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 104
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 103
-# barcode: ${wcs-slave.barcode[0].id}
- # 鏉＄爜鎵弿浠�
+ staNo: 204
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 103
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 205
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 1000
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
ip: 172.28.15.235
port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 172.28.15.235
+ port: 51236
# # LED1
# led[0]:
# id: 1
--
Gitblit v1.9.1