From 087a7abb6cfd669c7253c823d83e05f6eba78753 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 16 六月 2023 08:56:51 +0800 Subject: [PATCH] 提升机命令优化 --- src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 5 ++++- 1 files changed, 4 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 b264d65..99b40c0 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; @@ -246,6 +246,9 @@ // 鐢甸噺 try { Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine(); + if (chargeLine == null) { + return false; + } return this.getBatteryPower$() > chargeLine; } catch (Exception e) { News.error("fail", e); -- Gitblit v1.9.1