From 53292dc3901548020ae6cdb10de3a0c690ef354a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 三月 2025 10:01:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index d8d6497..a0e6732 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.NavigateNode;
@@ -45,6 +47,8 @@
private NavigateUtils navigateUtils;
@Autowired
private ConfigService configService;
+ @Autowired
+ private BasShuttleService basShuttleService;
/**
* 璋冨害杞﹁締-璋冨害鎸囧畾绌挎杞�
@@ -57,18 +61,6 @@
* 璋冨害杞﹁締
*/
public boolean dispatchShuttle(Integer wrkNo, String locNo) {
- //妫�娴嬬洰鏍囧簱浣嶇粍鏄惁瀛樺湪灏忚溅锛屽瀛樺湪灏忚溅鍒欑洿鎺ユ寚瀹氳杞�
- WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
- if (wrkMast != null) {
- String targetLocNo = wrkMast.getIoType() < 100 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
- List<String> groupLoc = Utils.getGroupLoc(targetLocNo);
- Integer groupShuttleNo = Utils.checkGroupLocHasShuttle(groupLoc);
- if (groupShuttleNo != null) {
- //瀛樺湪灏忚溅锛岀洿鎺ヨ皟搴﹁杞�
- return shuttleMoveGenerate(wrkNo, locNo, groupShuttleNo);
- }
- }
-
ArrayList<ShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
@@ -88,6 +80,13 @@
continue;//灏忚溅蹇欑涓�
}
+ BasShuttle basShuttle = basShuttleService.selectOne(new EntityWrapper<BasShuttle>().eq("shuttle_no", shuttle.getId()));
+ if (basShuttle != null) {
+ if (basShuttle.getStatus() == 0) {
+ continue;//灏忚溅琚鐢�
+ }
+ }
+
int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠灞傞珮
String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
--
Gitblit v1.9.1