From a9b98ef2b0af7a4a830a2a4d3320d42e2779b152 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 16 十月 2024 10:02:43 +0800
Subject: [PATCH] #出库待机位自动搜索
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java | 12 +++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 4 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 45 ++++++++++++++++++++++
3 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java
index c7c1e4e..52badc0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java
@@ -1,8 +1,9 @@
package com.zy.asrs.wcs.core.entity;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.User;
@@ -242,5 +243,14 @@
return null;
}
+ public List<String> getStandbyLoc$() {
+ ArrayList<String> list = new ArrayList<>();
+ if (this.standbyLoc != null) {
+ List<String> standbyLocs = JSON.parseArray(this.standbyLoc, String.class);
+ list.addAll(standbyLocs);
+ }
+ return list;
+ }
+
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index 75586e0..0ed9518 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -478,7 +478,9 @@
String standbyLocNoFrom = shuttleStandbyFrom.getDeviceStandbyLoc();
//绌挎杞﹀嚭鎻愬崌鏈哄悗灏忚溅寰呮満浣�
- String shuttleFromLiftStandbyLoc = shuttleStandbyFrom.getStandbyLoc();
+ List<String> standbyLocs = shuttleStandbyFrom.getStandbyLoc$();//鑾峰彇鍏ㄩ儴寰呮満浣�
+ //鑾峰彇鍙敤寰呮満浣�
+ String shuttleFromLiftStandbyLoc = shuttleDispatcher.searchAvailableLocNo(Integer.valueOf(shuttleDevice.getDeviceNo()), shuttleDevice.getHostId(), shuttleThread.getStatus().getCurrentLocNo(), standbyLocs);
//鑾峰彇鍑哄簱浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
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 ee9f923..c307a4d 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
@@ -344,6 +344,51 @@
}
/**
+ * 鎼滅储鍙敤搴撲綅锛岄�氳繃灏忚溅鍙峰拰鐩爣搴撲綅
+ */
+ public String searchAvailableLocNo(Integer shuttleNo, Long hostId, String currentLocNo, List<String> locNos) {
+ BasShuttle basShuttle = basShuttleService.getOne(new LambdaQueryWrapper<BasShuttle>()
+ .eq(BasShuttle::getShuttleNo, shuttleNo)
+ .eq(BasShuttle::getHostId, hostId));
+ if (basShuttle == null) {
+ throw new CoolException("灏忚溅鍩虹鏁版嵁涓嶅瓨鍦�");
+ }
+
+ if (locNos.isEmpty()) {
+ throw new CoolException("褰撳墠灞傛棤閬胯浣嶇疆");
+ }
+
+ int lev = Utils.getLev(currentLocNo);
+
+ Integer finalDistance = ShuttleDispatcher.INF;
+ String recentLoc = null;
+ for (String loc : locNos) {
+ //褰撳墠绌挎杞﹀埌閬胯浣嶈绠�
+ List<NavigateNode> currentShuttlePath = NavigateUtils.calc(
+ currentLocNo
+ , loc
+ , NavigationMapType.NORMAL.id
+ , Utils.getShuttlePoints(shuttleNo, lev)
+ );//浣跨敤姝ｅ父閫氶亾鍦板浘
+ if (currentShuttlePath == null) {
+ continue;
+ }
+
+ Integer currDistance = NavigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ if (currDistance < finalDistance) {
+ finalDistance = currDistance;
+ recentLoc = loc;
+ }
+ }
+
+ if (recentLoc == null) {
+ throw new CoolException("鎼滅储閬胯浣嶇疆澶辫触");
+ }
+
+ return recentLoc;
+ }
+
+ /**
* 妫�娴嬬洰鏍囨ゼ灞傝溅鏁伴噺鏄惁灏忎簬鍏佽鐨勬渶澶ф暟閲�
* true: 灏忎簬鏈�澶ф暟閲� false: 澶т簬鎴栫瓑浜庢渶澶ф暟閲�
*/
--
Gitblit v1.9.1