From eb3ad0d690a7aec77b964918e97247549b04a0e2 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 09 十月 2023 08:34:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 3 ++-
src/main/java/com/zy/common/utils/NavigateUtils.java | 2 +-
src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java | 1 +
src/main/resources/application.yml | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java b/src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java
index b9c3ade..021e292 100644
--- a/src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java
@@ -23,6 +23,7 @@
//缁撴灉璁伅
private String message;
+ //绔欑偣
private Integer from_ws;
}
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index 91baf99..e747186 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -267,7 +267,7 @@
mapType = NavigationMapType.NORMAL.id;
}
- path.remove(0);//杩囨护绗竴涓妭鐐癸紝浠ラ槻绗竴涓妭鐐规槸F鐘舵�佸鑷磋溅杈嗕笉鍔�
+
NavigateSolution solution = new NavigateSolution(mapType, lev, null, Utils.getShuttlePoints(shuttleNo, lev));//鑾峰彇鏃犵櫧鍚嶅崟鍦板浘(璇ュ湴鍥惧寘鍚皬杞﹀潗鏍�)
int[][] map = solution.map;
diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
index b9ed6ba..5747ee5 100644
--- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
@@ -137,7 +137,8 @@
WrkMast wrkMast1 = wrkMastMapper.selectByWorkNo(wrkNo);
if (wrkMast1 != null) {
- int lev = Utils.getLev(wrkMast1.getLocNo());//鐩爣妤煎眰
+ String locNO=wrkMast1.getIoType()<100?wrkMast1.getLocNo():wrkMast1.getSourceLocNo();
+ int lev = Utils.getLev(locNO);//鐩爣妤煎眰
//妫�娴嬬洰鏍囨ゼ灞傝溅鏁伴噺鏄惁灏忎簬鍏佽鐨勬渶澶ф暟閲�
boolean checkDispatchMaxNum = checkDispatchMaxNum(lev);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fc204ed..b45d4ac 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,7 +38,7 @@
enable: false
wms:
- url: localhost:8081/tzskwms
+ url: 10.10.10.40:8080/tzskwms
robot:
url: http://10.10.10.41:7002
--
Gitblit v1.9.1