From e98d4b1133ed058bfe1e6af75be9975aebfc32d8 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 16:00:35 +0800
Subject: [PATCH] 最后可运行版本
---
src/main/resources/application.yml | 506 +++++++++++++++++--------------------------------------
1 files changed, 158 insertions(+), 348 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c000ded..a57ce72 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 9094
servlet:
context-path: /@pom.build.finalName@
@@ -8,15 +8,17 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=lfdasrs
+ url: jdbc:sqlserver://172.26.11.80:1433;databasename=jnejc-hkwms
username: sa
password: sa@123
mvc:
static-path-pattern: /**
- redis:
- host: localhost
- port: 6379
- database: 0
+
+zyHikUrl: 172.26.4.184:8000
+# redis:
+# host: localhost
+# port: 6379
+# database: 0
# password: xltys1995
mybatis-plus:
@@ -34,21 +36,50 @@
enable: false
wms:
- url: localhost:8080/lfdwms
+ url: 127.0.0.1:8084/hkwms
+
+#mes瀵规帴
+mes:
+ url: http://192.9.100.173:8088/prod-api/basicmodel/WmsFit/Api/
+# url: http://172.26.160.73:8080/basicmodel/WmsFit/Api/
+# url: http://172.26.160.5:8080/basicmodel/WmsFit/Api/
+ #榛樿鎺ュ彛鎿嶄綔浜哄憳id
+ defaultUserId: 30
+#娴峰悍瀵规帴
+hik:
+ switch: false
+ url: http://172.26.11.98:80/rcs/rtas/
+ station: Z-LVL20,Z-LVL21,Z-LVL22,Z-LVL23,Z-LVL24,Z-LVL25,Z-LVL26,Z-LVL27,Z-LVL28,Z-LVL29,Z-LVL30,Z-LVL31
+ Z-LZP1,Z-LZP2,Z-LZP3,Z-LZP4,Z-LZP5,Z-LZP6,Z-LZP7,Z-LZP8,Z-LZP9,Z-LZP10,Z-LZP11,Z-LZP12,Z-LZP13,Z-LZP14,
+ Z-LZP15,Z-LZP16,Z-LZP17,Z-LZP18,Z-LZP19,Z-LZP20,Z-LZP21,Z-LZP22,Z-LZP23,Z-LZP24,Z-LZP25,Z-LZP26,Z-LZP27
+ Z-LZP28,Z-LZP29,Z-LZP30,Z-LZP31,Z-LZP32,Z-LZP33
+ renyuan: Z-LZH25,Z-LZH26,Z-LZH27,Z-LZH28,Z-LZH29,Z-LZH30,Z-LZH31,Z-LZH32,Z-LZH33,Z-LZH34,Z-LZH35,Z-LZH36,Z-LZH37,
+ Z-LZH38,Z-LZH39,L-LZH40,L-LZH41,L-LZH42,Z-LZP7,Z-LZP8,Z-LZP9,Z-LZP10,Z-LZP11,Z-LZP12,Z-LZP13,Z-LZP14,
+ Z-LZP15,Z-LZP16,Z-LZP17,Z-LZP18,Z-LZP19,Z-LZP20,Z-LZP21,Z-LZP22,Z-LZP23,Z-LZP24,Z-LZP25,Z-LZP26,Z-LZP27
+ Z-LZP28,Z-LZP29,Z-LZP30,Z-LZP31
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 9,12,15,18
+ doubleLocs: 3
+ # 宸︽繁搴撲綅鎺掑彿
+ # doubleLocsLeft: 4,7,11,15,19,23
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 3
+ # 宸︽祬搴撲綅鎺掑彿
+ shallowLocsLeft: 1
+ # 鍙虫祬搴撲綅鎺掑彿
+ shallowLocsRight: 2
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.1
- port: 6000
+ ip: 172.26.4.131
+ port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -57,298 +88,101 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.2
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 4
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.3
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 121
- row: 5
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 122
+ staNo: 401
row: 6
bay: 1
lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.4
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 129
- row: 7
- bay: 1
+ staNo: 402
+ row: 6
+ bay: 15
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 130
- row: 8
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.5
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 10
+ staNo: 401
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 10.10.10.6
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 208
- row: 13
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 209
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�7
- crn[6]:
- id: 7
- ip: 10.10.10.7
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 214
- row: 16
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 215
- row: 17
- bay: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 402
+ row: 6
+ bay: 15
lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.100
+ ip: 172.26.4.141
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 401
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 401
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 109
+ staNo: 402
barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
+ backSta: 402
led: ${wcs-slave.led[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 116
- led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 401
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 401
led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�2
+ # 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 109
+ staNo: 402
barcode: ${wcs-slave.barcode[1].id}
+ backSta: 402
led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 101
+ staNo: 401
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 401
led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[1]:
- staNo: 109
+ staNo: 402
barcode: ${wcs-slave.barcode[1].id}
+ backSta: 402
led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
-
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 126
- led: ${wcs-slave.led[3].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 134
- led: ${wcs-slave.led[4].id}
- # 鍑哄簱鍙�2
- outSta[2]:
- staNo: 100
+ staNo: 401
led: ${wcs-slave.led[0].id}
-
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 402
+ led: ${wcs-slave.led[1].id}
# 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.110
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- backSta: 200
- led: ${wcs-slave.led[5].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 206
- led: ${wcs-slave.led[7].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- backSta: 212
- led: ${wcs-slave.led[9].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[5].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[7].id}
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- led: ${wcs-slave.led[9].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[5].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[7].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- led: ${wcs-slave.led[9].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 205
- led: ${wcs-slave.led[6].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 211
- led: ${wcs-slave.led[8].id}
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 217
- led: ${wcs-slave.led[10].id}
-
+ # devp[1]:
+ # id: 2
+ # ip: 172.17.60.118
+ # port: 102
+ # rack: 0
+ # slot: 0
+ # # 鍏ュ簱鍙�1
+ # inSta[0]:
+ # staNo: 1002
+ # barcode: ${wcs-slave.barcode[2].id}
+ # backSta: 1001
+ # led: ${wcs-slave.led[7].id}
+ # # 鍏ュ簱鍙�2
+ # inSta[1]:
+ # staNo: 1007
+ # barcode: ${wcs-slave.barcode[3].id}
+ # backSta: 1003
+ # led: ${wcs-slave.led[8].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
@@ -357,102 +191,78 @@
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 10.10.10.121
port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.123
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.124
- port: 51236
- # 鏉＄爜鎵弿浠�5
- barcode[4]:
- id: 5
- ip: 10.10.10.125
- port: 51236
- # 鏉＄爜鎵弿浠�6
- barcode[5]:
- id: 6
- ip: 10.10.10.126
- port: 51236
- # LED1
+ # # 鏉＄爜鎵弿浠�3
+ # barcode[2]:
+ # id: 3
+ # ip: 10.10.10.121
+ # port: 51236
+ # # 鏉＄爜鎵弿浠�4
+ # barcode[3]:
+ # id: 4
+ # ip: 10.10.10.121
+ # port: 51236
+ # LED1
led[0]:
id: 1
- ip: 10.10.10.249
+ ip: 172.26.4.163
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
+ staArr: 401
# LED2
led[1]:
id: 2
- ip: 10.10.10.248
+ ip: 172.26.4.161
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.247
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.246
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 126
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.245
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 134
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.244
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 201
- # LED7
- led[6]:
- id: 7
- ip: 10.10.10.243
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 205
- # LED8
- led[7]:
- id: 8
- ip: 10.10.10.242
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 207
- # LED9
- led[8]:
- id: 9
- ip: 10.10.10.241
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 211
- # LED10
- led[9]:
- id: 10
- ip: 10.10.10.240
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 213
- # LED11
- led[10]:
- id: 11
- ip: 10.10.10.239
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 217
\ No newline at end of file
+ staArr: 402
+# # LED3
+# led[2]:
+# id: 3
+# ip: 172.17.60.181
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1058
+# # LED4
+# led[3]:
+# id: 4
+# ip: 172.17.60.184
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1064
+# # LED5
+# led[4]:
+# id: 5
+# ip: 172.17.60.185
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1068
+# # LED6
+# led[5]:
+# id: 6
+# ip: 172.17.60.186
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1071
+# # LED7
+# led[6]:
+# id: 7
+# ip: 172.17.60.182
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1074
+# # LED8
+# led[7]:
+# id: 8
+# ip: 172.17.60.187
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 1001
+# # LED9
+# led[8]:
+# id: 9
+# ip: 172.17.60.188
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 1007
\ No newline at end of file
--
Gitblit v1.9.1