From 704bdf296dfe7ecd8699369d29816b9af574f3b0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 08 十二月 2023 09:18:51 +0800
Subject: [PATCH] #出库强制预留小车给入库任务
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index ba62c21..b655e3a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1282,7 +1282,7 @@
if (wrkMast.getShuttleNo() == null) {//娌℃湁缁戝畾灏忚溅锛岃繘琛岃皟搴�
//寮哄埗棰勭暀涓�鍙板皬杞︾粰鍏ュ簱浠诲姟
int lev = Utils.getLev(wrkMast.getSourceLocNo());
- //鑾峰彇褰撳墠妤煎眰鏈夊嚑鍙扮┖闂插彲鐢ㄥ皬杞�
+ //鑾峰彇褰撳墠妤煎眰鏈夊嚑鍙板彲鐢ㄥ皬杞�
int shuttleCount = shuttleDispatchUtils.getShuttleCountByLev(lev);
if (shuttleCount >= 2) {//鍙湁鍙敤灏忚溅鏁伴噺澶т簬2锛屾墠杩涜鍏ュ簱浠诲姟棰勭暀灏忚溅
int shuttleWrkInObligateCount = 1;//棰勭暀灏忚溅鏁伴噺
diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
index c978bc0..6006693 100644
--- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
@@ -468,7 +468,7 @@
}
/**
- * 鑾峰彇妤煎眰鍙敤绌洪棽灏忚溅鏁伴噺
+ * 鑾峰彇妤煎眰鍙敤灏忚溅鏁伴噺
*/
public int getShuttleCountByLev(int lev) {
int count = 0;
@@ -488,8 +488,8 @@
continue;//瀛樺湪鍏呯數浠诲姟锛岃繃婊ゅ皬杞�
}
- if (!shuttleProtocol.isIdle()) {
- continue;//灏忚溅蹇欑涓�
+ if (shuttleProtocol.getWorkingMode() == 0) {
+ continue;//鎵嬪姩鐘舵��
}
if (shuttleProtocol.getSuspendState() == 1) {
@@ -498,7 +498,7 @@
}
if (shuttleProtocol.getPoint().getZ() == lev) {
- //鍚屼竴妤煎眰绌洪棽鍙敤灏忚溅
+ //鍚屼竴妤煎眰鍙敤灏忚溅
count++;
continue;
}
--
Gitblit v1.9.1