From cd761b085ddff0d4f55a0d5b892b3120cf8fa9d2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 13 一月 2026 13:18:04 +0800
Subject: [PATCH] 修改了AGV请求接口的逻辑，Mas获取返回信息的订单编号
---
src/main/resources/application.yml | 319 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 269 insertions(+), 50 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b43be08..dcb0e91 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,14 +1,14 @@
server:
- port: 9090
+ port: 9093
+ 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=jnejc-ljqwms
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,274 @@
swagger:
enable: false
+wms:
+ url: 127.0.0.1:8083/ljqwms
+
+#mes瀵规帴
+mes:
+
+ url: http://172.26.160.5:80/dev-api/basicmodel/WmsFit/Api/
+ #榛樿鎺ュ彛鎿嶄綔浜哄憳id
+ defaultUserId: 30
+
+#娴峰悍瀵规帴
+hik:
+ switch: false
+ url: http://172.26.11.98:80/rcs/rtas/
+
+zyHikUrl: 127.0.0.1:8000
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1
+ # 宸︽繁搴撲綅鎺掑彿
+# doubleLocsLeft: 4,7,11,15,19,23
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 1
+ # 宸︽祬搴撲綅鎺掑彿
+ shallowLocsLeft: 2
+ # 鍙虫祬搴撲綅鎺掑彿
+ shallowLocsRight: 2
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 2
+ # 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- crn[1]:
- id: 1
- ip: 192.168.1.1
- port: 8888
- crn[2]:
- id: 1
- ip: 192.168.1.1
- port: 8888
- # 绔欑偣
+ ip: 172.26.1.131
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 301
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 307
+ row: 3
+ bay: 5
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 304
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 304
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 307
+ row: 3
+ bay: 5
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 301
+ row: 2
+ bay: 1
+ lev: 1
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # 鏉＄爜鎵弿浠�
+ ip: 172.26.1.141
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 301
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 302
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 301
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 302
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 301
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 302
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 303
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 306
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
+ outSta[2]:
+ staNo: 307
+ led: ${wcs-slave.led[2].id}
+# # 杈撻�佺嚎2
+# devp[1]:
+# id: 2
+# ip: 172.17.60.118
+# port: 102
+# rack: 0
+# slot: 0
+## # 鍏ュ簱鍙�1
+# inSta[0]:
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # LED
+ ip: 10.10.10.121
+ port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.121
+ port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.121
+ port: 51236
+# # 鏉＄爜鎵弿浠�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: 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: 303,302,301
+ # LED2
+ led[1]:
+ id: 2
+ ip: 172.17.60.183
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 304,305,306
+# # LED3
+ led[2]:
+ id: 3
+ ip: 172.17.60.181
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 307
+# # 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