From d2314059892561c4d9f89264db43cf92d741eb42 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 26 六月 2025 15:05:08 +0800
Subject: [PATCH] 完善待测
---
src/main/resources/application.yml | 124 +++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3359e70..042e374 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=gzynasrs
+ 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,78 +35,128 @@
enable: false
wms:
- url: localhost:8080/klswms
+ url: 10.12.55.200:8080/fnwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs:
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.12.55.70
port: 8888
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 3
- bay: 1
+ staNo: 202
+ row: 1
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 1000
+ row: 1
+ bay: 25
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 203
row: 2
- bay: 1
+ 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: 10.10.10.50
+ 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: 102
-# # 鎷ｆ枡鍏ュ簱鍙�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: 10.10.10.52
+ ip: 172.28.15.235
port: 51236
- # LED1
- led[0]:
- id: 1
- ip: 10.10.10.60
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
-
- #socket
- socket[0]:
- id: 1
- ip: 10.10.10.100
- port: 10001
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 172.28.15.235
+ port: 51236
+# # LED1
+# led[0]:
+# id: 1
+# ip: 10.10.10.60
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 110
+#
+# #socket
+# socket[0]:
+# id: 1
+# ip: 10.10.10.100
+# port: 10001
# tcp鏈嶅姟绔厤缃�
tcp:
@@ -124,4 +175,7 @@
#涓婁笅琛屾棩蹇楁墦鍗�
printPacLog: true
#鏉＄爜闀垮害
- barcodeLen: 8
\ No newline at end of file
+ barcodeLen: 12
+
+test:
+ url: 127.0.0.1:8080/test
\ No newline at end of file
--
Gitblit v1.9.1