From bf089236f2d2350dc515dbecf04178861d1f5089 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 17 十一月 2025 13:12:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index ec4d5f3..5a1e9e3 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -1,8 +1,14 @@
package com.zy.core.dispatcher;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.ShuttleGatherResult;
+import com.zy.asrs.domain.param.ShuttleGatherParam;
+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,30 +51,20 @@
private NavigateUtils navigateUtils;
@Autowired
private ConfigService configService;
+ @Autowired
+ private BasShuttleService basShuttleService;
/**
* 璋冨害杞﹁締-璋冨害鎸囧畾绌挎杞�
*/
- public boolean dispatchShuttle(Integer wrkNo, String locNo, Integer shuttleNo) {
+ public synchronized boolean dispatchShuttle(Integer wrkNo, String locNo, Integer shuttleNo) {
return shuttleMoveGenerate(wrkNo, locNo, shuttleNo);
}
/**
* 璋冨害杞﹁締
*/
- 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);
- }
- }
-
+ public synchronized boolean dispatchShuttle(Integer wrkNo, String locNo) {
ArrayList<ShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
@@ -86,6 +82,13 @@
if (!shuttleThread.isIdle()) {
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());//灏忚溅褰撳墠灞傞珮
@@ -165,9 +168,16 @@
//褰撳墠绌挎杞﹀簱浣嶅彿
String currentLocNo = shuttleProtocol.getCurrentLocNo();
int currentLev = Utils.getLev(currentLocNo);
- List<WrkMast> wrkMasts1 = wrkMastService.selectNoShuttleWrkByLev(currentLev);//鍒ゆ柇褰撳墠绌挎杞︽ゼ灞傛槸鍚︽湁寰呭垎閰嶈溅杈嗙殑浠诲姟锛屽鏋滄湁鍒欎笉鍒嗛厤杩欒締杞�
+ //鍒ゆ柇褰撳墠妤煎眰鏄惁鏈変换鍔★紝濡傛灉鏈夊垯涓嶅垎閰嶈繖杈嗚溅
+ List<WrkMast> wrkMasts1 = wrkMastService.selectWrkByLev(currentLev);
+ int currentLevTaskCount = wrkMasts1.size();
+ for (WrkMast wrkMast : wrkMasts1) {
+ if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
+ currentLevTaskCount--;
+ }
+ }
int shuttleCount = this.getShuttleCountByLev(currentLev);//鑾峰彇绌挎杞︽ゼ灞傝溅杈嗘暟閲�
- if (!wrkMasts1.isEmpty() && shuttleCount <= 1) {
+ if (currentLevTaskCount > 0 && shuttleCount <= 1) {
//瀛樺湪鍏朵粬浠诲姟涓斿彲鐢ㄥ皬杞︽暟閲忓皬浜庣瓑浜�1锛岃烦杩囪繖杈嗚溅
continue;
}
@@ -199,7 +209,7 @@
* 灏忚溅杩佺Щ浠诲姟鐢熸垚
*/
@Transactional
- public boolean shuttleMoveGenerate(Integer wrkNo, String locNo, Integer shuttleNo) {
+ public synchronized boolean shuttleMoveGenerate(Integer wrkNo, String locNo, Integer shuttleNo) {
Date now = new Date();
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
@@ -226,11 +236,21 @@
return false;
}
+ //鑾峰彇涓诲伐浣滄。淇℃伅
+ WrkMast mainWrkMast = wrkMastService.selectByWorkNo(wrkNo);
+
//鍒ゆ柇鏄惁鏈夊叾浠栦换鍔℃鍦ㄤ娇鐢ㄧ┛姊溅
WrkMast wrkMast2 = wrkMastService.selectShuttleWorking(shuttleNo);
if (wrkMast2 != null) {//灏忚溅瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍚庡啀鐢熸垚鏂扮殑浠诲姟
- News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
- return false;
+ if (mainWrkMast == null) {
+ News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
+ return false;
+ }else {
+ if (!shuttleNo.equals(mainWrkMast.getShuttleNo())) {
+ News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
+ return false;
+ }
+ }
}
Integer sourceStaNo = null;//灏忚溅鎹㈠眰婧愮珯鐐�
@@ -277,13 +297,42 @@
}
//缁欏伐浣滄。缁戝畾灏忚溅鍙�
- WrkMast wrkMast1 = wrkMastService.selectByWorkNo(wrkNo);
- if (wrkMast1 != null) {
- wrkMast1.setShuttleNo(shuttleNo);
- wrkMastService.updateById(wrkMast1);
+ if (mainWrkMast != null) {
+ mainWrkMast.setShuttleNo(shuttleNo);
+ wrkMastService.updateById(mainWrkMast);
}
return true;
+ }
+
+ /**
+ * 灏忚溅闆嗗悎
+ */
+ public List<ShuttleGatherResult> shuttleGather(ShuttleGatherParam param) {
+ Wrapper<BasShuttle> wrapper = new EntityWrapper<BasShuttle>().eq("status", 1);
+ if (param != null) {
+ if (!param.getShuttleNos().isEmpty()) {
+ wrapper.in("shuttle_no", param.getShuttleNos());
+ }
+ }
+
+ List<BasShuttle> basShuttles = basShuttleService.selectList(wrapper);
+ 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;
}
/**
@@ -304,6 +353,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;
}
@@ -378,6 +437,15 @@
continue;
}
+ //鍒ゆ柇褰撳墠灞傛槸鍚︽棤鎵樼洏
+ if (forkLiftStaProtocol.getHasTray()) {
+ continue;
+ }
+
+ if (forkLiftStaProtocol.getHasCar()) {
+ continue;
+ }
+
//鍒ゆ柇鐩爣妤煎眰绔欑偣鏄惁鏃犳墭鐩�
ForkLiftStaProtocol targetLiftStaProtocol = ForkLiftUtils.getLiftStaByLev(slave.getId(), targetLev);
if (targetLiftStaProtocol == null) {
@@ -388,6 +456,10 @@
continue;//鏈夋墭鐩樿烦杩�
}
+ if (targetLiftStaProtocol.getHasCar()) {
+ continue;
+ }
+
list.add(forkLiftStaProtocol);
}
--
Gitblit v1.9.1