From c6bca77cf2603ceebc07fec7ece783c2f9bca74e Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 10 六月 2023 19:24:53 +0800 Subject: [PATCH] Base地图更新 --- 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