From d2bb7362d92f0809572e15f8299ac608fe263a87 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 21 四月 2025 16:23:47 +0800
Subject: [PATCH] 输送线命令下发失败重新推送队列
---
src/main/resources/application.yml | 318 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 274 insertions(+), 44 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 41f79b8..b6bbee5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,14 +1,14 @@
server:
port: 9090
+ servlet:
+ context-path: /@pom.build.finalName@
spring:
application:
-# name: @pom.artifactId@
- name:
+ name: @pom.build.finalName@
datasource:
- # sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
+ url: jdbc:sqlserver://10.10.10.210:1433;databasename=hylyasrs
username: sa
password: sa@123
mvc:
@@ -21,11 +21,11 @@
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
- global-config:
- field-strategy: 0
+# global-config:
+# field-strategy: 0
logging:
- path: /stock/out/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -33,55 +33,285 @@
swagger:
enable: false
+wms:
+ url: 10.10.10.210:8080/lywms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8,9,12,13,16
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
+ # 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
+ ip: 10.10.10.101
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.1.1
- port: 8888
+ ip: 10.10.10.111
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 203
+ row: 7
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 201
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 201
+ row: 6
+ bay: 1
+ lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 203
+ row: 7
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.1.1
- port: 8888
- # 绔欑偣
+ ip: 10.10.10.121
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 304
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 301
+ row: 10
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 301
+ row: 10
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.130
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 402
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 402
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 402
+ row: 14
+ bay: 1
+ lev: 1
+ # 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
+ ip: 10.10.10.50
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[3].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 305
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[5].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 103
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 203
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 305
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 102
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 202
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 303
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 202
+ barcode: ${wcs-slave.barcode[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 303
+ barcode: ${wcs-slave.barcode[2].id}
+
+ devp[1]:
+ id: 2
+ ip: 10.10.10.93
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[6].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 402
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 401
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[3].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # LED
+ ip: 10.10.10.52
+ port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.53
+ port: 51236
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.54
+ port: 51236
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.95
+ port: 51236
+ # LED1
led[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.1.1
- port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ip: 10.10.10.201
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 102
+ # LED2
+ led[1]:
+ id: 2
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 103
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.203
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 202
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.204
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 204
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.205
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 303
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 305
+ # LED7
+ led[6]:
+ id: 7
+ ip: 10.10.10.207
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 402
--
Gitblit v1.9.1