From 69f5e7d6deb58da328d809e2904310240f9502d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 10 六月 2023 19:13:39 +0800
Subject: [PATCH] yml

---
 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java |    6 +++++-
 1 files changed, 5 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 cebf771..b264d65 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -54,7 +54,7 @@
     private String sourceLocNo;
 
     /**
-     * 鐩爣搴撲綅
+     * 鐩爣搴撲綅f
      */
     private String locNo;
 
@@ -277,6 +277,10 @@
 
     // 鏄惁婊¤冻鍏呯數鐘舵��
     public Boolean isRequireCharge() {
+        if (this.busyStatusType == null || this.pakMk == null || this.errorCodeType == null || this.taskNo == null) {
+            return false;
+        }
+
         boolean res = this.busyStatusType.equals(ShuttleStatusType.IDLE)
                 && this.pakMk.equals(true)
                 && this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)

--
Gitblit v1.9.1