From 5e729441b08a61d2e3b14a6d6c9d1f2bde4ccfc0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 02 四月 2025 09:03:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index a0e6732..dd6f4fd 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -1,7 +1,9 @@
package com.zy.core.dispatcher;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.ShuttleGatherResult;
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasShuttleService;
@@ -295,6 +297,29 @@
}
/**
+ * 灏忚溅闆嗗悎
+ */
+ public List<ShuttleGatherResult> shuttleGather() {
+ List<BasShuttle> basShuttles = basShuttleService.selectList(new EntityWrapper<BasShuttle>().eq("status", 1));
+ List<ShuttleGatherResult> list = new ArrayList<>();
+ for (BasShuttle basShuttle : basShuttles) {
+ String idleLoc = basShuttle.getIdleLoc();
+ if(Cools.isEmpty(idleLoc)) {
+ continue;
+ }
+
+ boolean result = shuttleMoveGenerate(null, idleLoc, basShuttle.getShuttleNo());
+
+ ShuttleGatherResult gatherResult = new ShuttleGatherResult();
+ gatherResult.setShuttleNo(basShuttle.getShuttleNo());
+ gatherResult.setIdleLoc(idleLoc);
+ gatherResult.setResult(result);
+ list.add(gatherResult);
+ }
+ return list;
+ }
+
+ /**
* 妫�娴嬬洰鏍囨ゼ灞傝溅鏁伴噺鏄惁灏忎簬鍏佽鐨勬渶澶ф暟閲�
* true: 灏忎簬鏈�澶ф暟閲� false: 澶т簬鎴栫瓑浜庢渶澶ф暟閲�
*/
@@ -312,6 +337,16 @@
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
if (shuttleProtocol == null || shuttleProtocol.getShuttleNo() == null) {
+ continue;
+ }
+
+ //灏忚溅鏈夊厖鐢典换鍔�
+ if (shuttleThread.isCharging()) {
+ continue;
+ }
+
+ //灏忚溅鏁呴殰璺宠繃
+ if (shuttleThread.isFault()) {
continue;
}
@@ -386,6 +421,15 @@
continue;
}
+ //鍒ゆ柇褰撳墠灞傛槸鍚︽棤鎵樼洏
+ if (forkLiftStaProtocol.getHasTray()) {
+ continue;
+ }
+
+ if (forkLiftStaProtocol.getHasCar()) {
+ continue;
+ }
+
//鍒ゆ柇鐩爣妤煎眰绔欑偣鏄惁鏃犳墭鐩�
ForkLiftStaProtocol targetLiftStaProtocol = ForkLiftUtils.getLiftStaByLev(slave.getId(), targetLev);
if (targetLiftStaProtocol == null) {
@@ -396,6 +440,10 @@
continue;//鏈夋墭鐩樿烦杩�
}
+ if (targetLiftStaProtocol.getHasCar()) {
+ continue;
+ }
+
list.add(forkLiftStaProtocol);
}
--
Gitblit v1.9.1