From 0956cd2d3f2840f2f26855f05a83165d63dd7ba1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 十一月 2022 15:34:55 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 175 +++++++++++++++++++++++++--------------------------------
1 files changed, 77 insertions(+), 98 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ee826a3..b282c5a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -7,12 +7,8 @@
application:
name: @pom.build.finalName@
datasource:
- # sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
- #username: sa
- #password: eisoft
- url: jdbc:sqlserver://192.168.2.250:1433;databasename=jsasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=gzynasrs
username: sa
password: sa@123
mvc:
@@ -37,135 +33,118 @@
swagger:
enable: false
+wms:
+ url: localhost:8080/ynwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ # 鍙屾繁
+ doubleDeep: false
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs:
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.6.9
- port: 102
+ ip: 172.28.15.210
+ port: 8888
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 5
+ staNo: 103
row: 2
- bay: 0
+ bay: 1
+ lev: 1
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 108
+ row: 1
+ bay: 19
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
- row: 1
- bay: 0
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 192.168.6.20
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
staNo: 107
- row: 4
- bay: 0
+ row: 1
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- row: 3
- bay: 0
+ 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
+ row: 2
+ bay: 19
+ lev: 1
+
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.6.120
+ ip: 172.28.15.220
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 1
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 1
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 2
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 3
- # 杈撻�佺嚎
- devp[1]:
- id: 2
- ip: 192.168.6.21
- port: 6000
- rack: 0
- slot: 1
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 105
- barcode: ${wcs-slave.barcode[1].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 105
+ staNo: 103
# 鍑哄簱鍙�1
outSta[0]:
staNo: 104
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 104
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 103
+# barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.6.150
+ ip: 172.28.15.235
port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[1]:
- id: 2
- ip: 192.168.6.151
- port: 51236
- # 鍙拌溅
- car[0]:
- id: 1
- ip: 192.168.10.150
- port: 51236
- # LED1
- led[0]:
- id: 1
- ip: 192.168.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 2,3
- # 纾呯О
-# scale[0]:
+# # LED1
+# led[0]:
# id: 1
-# ip: 192.168.10.152
-# port: 8888
+# 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:
+ #tcp/ip鍗忚绔彛
+ port: 51236
+ #蹇冭烦 s
+ heart-seconds: 120
+ #鏈�澶ц繛鎺ユ暟
+ backlog: 128
+ #鏄惁寮�鍚痥eepAlive
+ keep-alive: true
+ #鍙戦�佹粦鍔ㄧ獥鍙�(256KB)
+ sndbuf: 262144
+ #鎺ュ彈婊戝姩绐楀彛(2MB)
+ rcvbuf: 2097152
+ #涓婁笅琛屾棩蹇楁墦鍗�
+ printPacLog: true
+ #鏉＄爜闀垮害
+ barcodeLen: 12
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+test:
+ url: 127.0.0.1:8080/test
\ No newline at end of file
--
Gitblit v1.9.1