From 02b0406395a71168cdda9a019874961ff86f5962 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 18:46:47 +0800
Subject: [PATCH] WCS功能完善
---
src/main/resources/application.yml | 244 ++++++++++++++++--------------------------------
1 files changed, 82 insertions(+), 162 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3250e87..40e57c8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 9091
servlet:
context-path: /@pom.build.finalName@
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=djwms
username: sa
password: sa@123
mvc:
@@ -34,190 +34,110 @@
enable: false
wms:
- url: localhost:8081/lywms
+ url: 127.0.0.1:8088/djwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
- # 鍫嗗灈鏈�1
- crn[0]:
- id: 1
- 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
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- 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
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- 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
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
- row: 10
- bay: 1
- lev: 1
+ groupCount: 2
- # 杈撻�佺嚎
+ # 鍫嗗灈鏈�1
+# crn[0]:
+# id: 1
+# ip: 172.26.11.31
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 201
+# row: 2
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+# crnInStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 203
+# row: 1
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 203
+# row: 1
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+# crnOutStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 205
+# row: 1
+# bay: 9
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+# crnOutStn[2]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 201
+# row: 2
+# bay: 1
+# lev: 1
+
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 172.26.11.50
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[2].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].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
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 103
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 303
- barcode: ${wcs-slave.barcode[2].id}
- # 鏉＄爜鎵弿浠�
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 101
+ led: ${wcs-slave.led[0].id}
+
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 172.26.11.43
port: 51236
- barcode[1]:
- id: 2
- ip: 10.10.10.52
- port: 51236
- barcode[2]:
- id: 3
- ip: 10.10.10.52
- port: 51236
- # LED1
+
+ # LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 172.26.11.82
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.203
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 124
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.204
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 131
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.205
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
- # LED6
- led[5]:
- id: 5
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
\ No newline at end of file
+ staArr: 103,104
+ crnId: 1
+# TMS
+dj:
+ url: http://172.26.11.2:8080
+#娴峰悍瀵规帴
+hik:
+ url: http://172.26.11.98:80/rcs/rtas/
\ No newline at end of file
--
Gitblit v1.9.1