From f25949443a6e59eda90b47ab4c423668bcb690a6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 03 七月 2023 11:21:03 +0800
Subject: [PATCH] 中段码根据规则进行更新 行走少于五个库位,不传中断码 行走少于十个库位,中断码给倒数第二个 行走大于十个库位,中断码给倒数第三个

---
 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 065926c..7c57f24 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -264,7 +264,8 @@
         boolean res = this.busyStatusType.equals(ShuttleStatusType.IDLE)
                 && this.pakMk.equals(true)
                 && this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
-                && (this.taskNo == 0 || this.taskNo == taskNo)
+                && (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
+                && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
                 ;
         if (!res) {
             return res;

--
Gitblit v1.9.1