From d448b572c769acf894c139b5f9141e5254cc83ae Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 27 十月 2023 14:15:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
index 603d742..f17d9be 100644
--- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
@@ -69,6 +69,18 @@
* 璋冨害杞﹁締
*/
public boolean dispatchShuttle(Integer wrkNo, String locNo) {
+ //妫�娴嬬洰鏍囧簱浣嶇粍鏄惁瀛樺湪灏忚溅锛屽瀛樺湪灏忚溅鍒欑洿鎺ユ寚瀹氳杞�
+ WrkMast wrkMast = wrkMastMapper.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<NyShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
ArrayList<NyShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
@@ -137,8 +149,8 @@
WrkMast wrkMast1 = wrkMastMapper.selectByWorkNo(wrkNo);
if (wrkMast1 != null) {
- String locNO=wrkMast1.getIoType()<100?wrkMast1.getLocNo():wrkMast1.getSourceLocNo();
- int lev = Utils.getLev(locNO);//鐩爣妤煎眰
+ String targetLoc = wrkMast1.getIoType() < 100 ? wrkMast1.getLocNo() : wrkMast1.getSourceLocNo();
+ int lev = Utils.getLev(targetLoc);//鐩爣妤煎眰
//妫�娴嬬洰鏍囨ゼ灞傝溅鏁伴噺鏄惁灏忎簬鍏佽鐨勬渶澶ф暟閲�
boolean checkDispatchMaxNum = checkDispatchMaxNum(lev);
@@ -236,7 +248,7 @@
if (Utils.getLev(locNo) != shuttleProtocol.getPoint().getZ()) {
//鐩爣搴撲綅鍜屽皬杞﹀簱浣嶅浜庝笉鍚屼竴妤煎眰锛岄渶瑕侀�氳繃鎻愬崌鏈鸿皟搴�
//鑾峰彇绌挎杞︽渶杩戜笖绌洪棽鐨勬彁鍗囨満杈撻�佺珯鐐�
- LiftStaProtocol liftSta = this.getRecentLiftSta(shuttleNo);
+ LiftStaProtocol liftSta = this.getRecentLiftSta(shuttleNo, Utils.getLev(locNo));
if (liftSta == null) {
return false;//娌℃湁鍙敤涓旂┖闂茬殑杈撻�佺珯鐐�
}
@@ -344,7 +356,7 @@
/**
* 鑾峰彇绌挎杞︽渶杩戜笖绌洪棽鐨勬彁鍗囨満杈撻�佺珯鐐�
*/
- public LiftStaProtocol getRecentLiftSta(Integer shuttleNo) {
+ public LiftStaProtocol getRecentLiftSta(Integer shuttleNo, Integer targetLev) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
if (shuttleThread == null) {
@@ -376,6 +388,16 @@
continue;
}
+ //鍒ゆ柇鐩爣妤煎眰绔欑偣鏄惁鏃犳墭鐩�
+ LiftStaProtocol targetLiftStaProtocol = NyLiftUtils.getLiftStaByLev(slave.getId(), targetLev);
+ if (targetLiftStaProtocol == null) {
+ continue;
+ }
+
+ if (targetLiftStaProtocol.getHasTray()) {
+ continue;//鏈夋墭鐩樿烦杩�
+ }
+
list.add(liftStaProtocol);
}
--
Gitblit v1.9.1