From 19d106566a98d12a3de3ef7f6816d88c99355ed4 Mon Sep 17 00:00:00 2001 From: TQS <56479841@qq.com> Date: 星期三, 04 一月 2023 10:39:21 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/SteProtocol.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java index 42515cc..6e65744 100644 --- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java @@ -4,6 +4,7 @@ import com.core.common.SpringUtils; import com.zy.asrs.entity.BasSte; import com.zy.asrs.service.BasSteService; +import com.zy.common.utils.News; import com.zy.core.enums.SteHisTaskStatusType; import com.zy.core.enums.SteLocaType; import com.zy.core.enums.SteStatusType; @@ -261,6 +262,7 @@ && !isAlarm() && this.chargeStatus == 0 && isEnable() + && this.getMode()==1 ; if (!res) { return res; @@ -270,7 +272,7 @@ String chargeLine = SpringUtils.getBean(BasSteService.class).selectById(this.steNo).getChargeLine(); return charge > Float.parseFloat(chargeLine); } catch (Exception e) { - log.error("fail", e); + News.error("fail", e); return false; } } -- Gitblit v1.9.1