From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/resources/application-dev.yml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ffa0b84..1e70885 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8084
servlet:
context-path: /@pom.build.finalName@
@@ -11,8 +11,11 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: sa
- password: Skyouc#23
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
+ password: sa@123
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jnejc-hkwms
+# username: sa
+# password: Skyouc#23
+# url: jdbc:sqlserver://192.168.4.24:1433;databasename=jsxswms
mvc:
static-path-pattern: /**
redis:
@@ -40,14 +43,14 @@
path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: asrs2023
+ pwd: xltys1995
swagger:
enable: false
#License鐩稿叧閰嶇疆
license:
- subject: integrationasrs
+ subject: jnejc-ljqasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -109,4 +112,43 @@
acctID: "647e849ab6fa0f"
username: "llw"
password: "666666"
- lcid: 2052
\ No newline at end of file
+ lcid: 2052
+
+#鍒嗗簱閰嶇疆
+wms:
+ #褰撳墠鏄鍑犲簱
+ currentId: 2
+ #褰撳墠搴撳悕绉�
+ currentName: 鍔犲伐搴�
+ #绔嬪簱AGV鑷姩杩愯揣鍑哄簱鍙ｇ紪鐮�
+ wmsTransStartStation1: 205
+ #绔嬪簱AGV鑷姩杩愯揣鍏ュ簱鍙ｇ紪鐮侊紙杈撻�佺嚎锛�
+ wmsTransStartStation2: 202
+ #绔嬪簱AGV鑷姩杩愯揣鍑哄簱鍙ｇ紪鐮侊紙杈撻�佺嚎锛�
+ wmsTransStartStation3: 204
+ #鎵樼洏鐗╂枡鍙�
+ zpalletId: tuopan
+
+#mes瀵规帴
+mes:
+
+ url: http://172.26.160.5:80/dev-api/basicmodel/WmsFit/Api/
+ #榛樿鎺ュ彛鎿嶄綔浜哄憳id
+ defaultUserId: 30
+
+#娴峰悍瀵规帴
+hik:
+ switch: true
+ url: http://172.26.11.98:80/
+
+#鍗庢檽瀵规帴
+hx:
+ url: http://172.26.3.131:8300/api/robot/
+ #杞簭浠诲姟涓嬪彂
+ taskNo: controller/task/submit
+ #鍏ョ珯鍏佽
+ inOk: eqpt/notify/product
+ #绂荤珯鍏佽
+
+ #绂荤珯瀹屾垚
+
--
Gitblit v1.9.1