From 84e4dffc40ca8fb9307a5f82fdb5d5511a1e070f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 23 十二月 2025 15:15:21 +0800
Subject: [PATCH] wcs功能调试完善
---
src/main/resources/application.yml | 235 ++++++++++++++++++++--------------------------------------
1 files changed, 81 insertions(+), 154 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5faeab7..8402316 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -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://127.0.0.1:1433;databasename=djwms
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -33,180 +33,107 @@
swagger:
enable: false
+wms:
+ url: 127.0.0.1:8088/djwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
+
# 鍫嗗灈鏈�1
- crn[0]:
- id: 1
- ip: 192.168.10.10
- port: 102
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 192.168.10.20
- port: 102
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 192.168.10.20
- port: 102
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 192.168.10.20
- port: 102
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 15
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 192.168.10.20
- port: 102
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 18
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 19
- bay: 1
- lev: 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: 192.168.10.100
+ ip: 172.26.11.50
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 170
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 180
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 176
- # 鏉＄爜鎵弿浠�
+ staNo: 101
+ led: ${wcs-slave.led[0].id}
+
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 192.168.10.130
+ ip: 172.26.11.43
port: 51236
+
# LED1
led[0]:
id: 1
- ip: 192.168.10.211
+ ip: 127.0.0.1
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 170
- # LED2
- led[1]:
- id: 2
- ip: 192.168.10.221
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 180
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ staArr: 103,104
+ crnId: 1
+dj:
+ url: http://172.26.11.2/
\ No newline at end of file
--
Gitblit v1.9.1