From 8ef2bb5e46d84594e6ed632c07ea0b47a1bf6c4d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 11 十二月 2024 16:15:17 +0800
Subject: [PATCH] #path similarity
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index d252ea6..581fa09 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -56,6 +56,8 @@
private ShuttleStandbyService shuttleStandbyService;
@Autowired
private DictService dictService;
+ @Autowired
+ private NavigateUtils navigateUtils;
public synchronized ShuttleThread searchIdleShuttle(Task task) {
String locNo = taskService.judgeInbound(task) ? task.getDestLoc() : task.getOriginLoc();
@@ -144,7 +146,7 @@
// 鍚屾ゼ灞傜洿鎺ヨ绠楀埌鐩爣搴撲綅
//褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鐩爣搴撲綅璺濈
- List<NavigateNode> currentShuttlePath = NavigateUtils.calc(
+ List<NavigateNode> currentShuttlePath = navigateUtils.calc(
currentLocNo
, locNo
, NavigationMapType.NORMAL.id
@@ -154,7 +156,7 @@
continue;
}
- Integer currDistance = NavigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ Integer currDistance = navigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
// 鎸傝浇浠诲姟鏉冮噸
List<Task> tasks = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
@@ -238,7 +240,7 @@
String targetLocNo = shuttleStandby.getDeviceLoc();
//褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鎻愬崌鏈哄緟鏈轰綅璺濈
- List<NavigateNode> currentShuttlePath = NavigateUtils.calc(
+ List<NavigateNode> currentShuttlePath = navigateUtils.calc(
currentLocNo
, targetLocNo
, NavigationMapType.NORMAL.id
@@ -248,7 +250,7 @@
continue;
}
- Integer currDistance = NavigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ Integer currDistance = navigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
// 涓嶅悓妤煎眰鏉冮噸
if (currentLev != Utils.getLev(locNo)) {
@@ -401,7 +403,7 @@
String recentLoc = null;
for (String loc : locNos) {
//褰撳墠绌挎杞﹀埌閬胯浣嶈绠�
- List<NavigateNode> currentShuttlePath = NavigateUtils.calc(
+ List<NavigateNode> currentShuttlePath = navigateUtils.calc(
currentLocNo
, loc
, NavigationMapType.NORMAL.id
@@ -411,7 +413,7 @@
continue;
}
- Integer currDistance = NavigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ Integer currDistance = navigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
if (currDistance < finalDistance) {
finalDistance = currDistance;
recentLoc = loc;
@@ -521,15 +523,15 @@
//鍒嗘瀽鍑哄簱璺緞寰呮満搴撲綅
public String analyzeOutPathWaitLoc(String startLoc, String targetLoc, Device shuttleDevice) {
//璁＄畻璺緞骞跺垎瑙ｆ垚涓ゆ鍔ㄤ綔
- List<NavigateNode> nodeList = NavigateUtils.calc(startLoc, targetLoc, NavigationMapType.DFX.id, Utils.getShuttlePoints(Integer.parseInt(shuttleDevice.getDeviceNo()), Utils.getLev(startLoc)));
+ List<NavigateNode> nodeList = navigateUtils.calc(startLoc, targetLoc, NavigationMapType.DFX.id, Utils.getShuttlePoints(Integer.parseInt(shuttleDevice.getDeviceNo()), Utils.getLev(startLoc)));
if (nodeList == null) {
News.error("{} dash {} can't find navigate path!", startLoc, targetLoc);
return null;
}
//鑾峰彇鍒嗘璺緞
- ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(nodeList);
+ ArrayList<ArrayList<NavigateNode>> data = navigateUtils.getSectionPath(nodeList);
if (data.size() <= 1) {
- return null;//涓ょ偣涔嬮棿鍙湁涓�娈佃矾寰�
+ return startLoc;//涓ょ偣涔嬮棿鍙湁涓�娈佃矾寰勶紝鍦ㄨ捣鐐逛綅缃瓑寰�
}
//鍙栧嚭鍊掓暟绗簩娈佃矾寰�
--
Gitblit v1.9.1