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 | 162 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 97 insertions(+), 65 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4b091b8..8402316 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://127.0.0.1:1433;databasename=djwms
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,75 +33,107 @@
swagger:
enable: false
+wms:
+ url: 127.0.0.1:8088/djwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
- crn[0]:
- id: 1
- ip: 192.168.6.10
- port: 102
- rack: 0
- slot: 2
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 5
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
- row: 1
- bay: 1
- lev: 1
- # 绔欑偣
+ # 鍙屾繁
+ doubleDeep: false
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ 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: 192.168.1.125
+ ip: 172.26.11.50
port: 102
rack: 0
- slot: 1
- # 鍏ュ簱鍙�
+ slot: 0
+ # 鍏ュ簱鍙�1
inSta[0]:
- staNo: 2
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- # 鍑哄簱鍙�
- outSta[0]:
- staNo: 6
- # 鎷ｆ枡鍏ュ簱鍙�
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 2
- # 鏉＄爜鎵弿浠�
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].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: 192.168.2.150
+ ip: 172.26.11.43
port: 51236
- # LED
+
+ # LED1
led[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.1.1
- port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ip: 127.0.0.1
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 103,104
+ crnId: 1
+dj:
+ url: http://172.26.11.2/
\ No newline at end of file
--
Gitblit v1.9.1