From 6c2dc9590108cdabb1200c54efc4ad1d6da5dc2f Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 29 九月 2022 10:39:54 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 212 +++++++++++++++++-----------------------------------
1 files changed, 71 insertions(+), 141 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 96fa0e0..947ab5f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8081
servlet:
context-path: /@pom.build.finalName@
@@ -8,9 +8,9 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=gzynasrs
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -33,188 +33,118 @@
swagger:
enable: false
+wms:
+ url: localhost:8080/ynwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs:
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
- port: 102
+ ip: 172.28.15.210
+ port: 8888
rack: 0
- slot: 1
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 205
+ staNo: 103
row: 2
- bay: 65
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
- row: 2
- bay: 0
+ staNo: 108
+ row: 1
+ bay: 19
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 3
- bay: 65
+ staNo: 107
+ row: 1
+ bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
- row: 3
- bay: 0
+ staNo: 108
+ row: 1
+ bay: 19
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 192.168.10.20
- port: 102
- rack: 0
- slot: 1
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 6
- bay: 65
+ staNo: 109
+ row: 2
+ bay: 19
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 124
- row: 6
- bay: 0
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
- row: 7
- bay: 65
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 7
- bay: 0
- lev: 1
+
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.10.100
+ ip: 172.28.15.220
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 301
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
-# # 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 202
-# barcode: ${wcs-slave.barcode[1].id}
- inSta[1]:
- staNo: 110
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 301
- # 绌烘澘鍏ュ簱鍙�2
-# emptyInSta[1]:
-# staNo: 202
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[1]:
- staNo: 126
+ staNo: 103
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 200
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 203
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 103
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 127
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[1]:
- staNo: 128
+ staNo: 104
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 103
+# barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.10.130
+ ip: 172.28.15.235
port: 51236
-# # 鏉＄爜鎵弿浠�
-# barcode[1]:
-# id: 2
-# ip: 192.168.10.131
-# port: 51236
- # LED1
- led[0]:
- id: 1
- ip: 192.168.10.211
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 113
- # LED2
- led[1]:
- id: 2
- ip: 192.168.10.221
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109
- # LED3
- led[2]:
- id: 3
- ip: 192.168.10.231
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
- # LED4
- led[3]:
- id: 4
- ip: 192.168.10.231
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 129
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.10.135
- port: 2
+# # 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:
+ #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