From 2df6d2c5d13a2a7909e802c5f190afeeba70f111 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 21 四月 2025 14:54:59 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 3f8a667..b38f998 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
@@ -144,6 +144,12 @@
}
// 鏈夋病鏈夎鍏朵粬浠诲姟璋冨害
+ List<Task> taskList = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
+ if (!taskList.isEmpty()) {
+ continue;
+ }
+
+
int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠灞傞珮
String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
@@ -154,10 +160,10 @@
// 鍚屾ゼ灞傜洿鎺ヨ绠楀埌鐩爣搴撲綅
//褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鐩爣搴撲綅璺濈
- List<NavigateNode> currentShuttlePath = navigateUtils.calc(
+ List<NavigateNode> currentShuttlePath = navigateUtils.calcWhiteList(
currentLocNo
, locNo
- , NavigationMapType.NORMAL.id
+ , NavigationMapType.DFX.id
, Utils.getShuttlePoints(Integer.parseInt(shuttleThread.getDevice().getDeviceNo()), currentLev)
);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
if (currentShuttlePath == null) {
@@ -228,6 +234,11 @@
}
// 鏈夋病鏈夎鍏朵粬浠诲姟璋冨害
+ List<Task> taskList = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
+ if (!taskList.isEmpty()) {
+ continue;
+ }
+
int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠灞傞珮
String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
@@ -254,7 +265,7 @@
List<NavigateNode> currentShuttlePath = navigateUtils.calc(
currentLocNo
, targetLocNo
- , NavigationMapType.NORMAL.id
+ , NavigationMapType.DFX.id
, Utils.getShuttlePoints(Integer.parseInt(shuttleThread.getDevice().getDeviceNo()), currentLev)
);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
if (currentShuttlePath == null) {
@@ -474,9 +485,9 @@
continue;
}
- if(!shuttleThread.isDeviceIdle()) {
- continue;
- }
+// if(!shuttleThread.isDeviceIdle()) {
+// continue;
+// }
if(shuttleProtocol.getCurrentLocNo() == null) {
continue;
--
Gitblit v1.9.1