From d91105438a87e013c6de439af89e49f055827b65 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 四月 2023 16:53:02 +0800
Subject: [PATCH] 四向穿梭车异常记录
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 302507e..43f7994 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -1,7 +1,9 @@
package com.zy.core.model.protocol;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasShuttleErr;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasShuttleErrService;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.LocMastService;
import com.zy.core.News;
@@ -38,6 +40,12 @@
* 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
*/
private Integer protocolStatus;
+
+// /**
+// * 灏忚溅褰撳墠鏄惁鏈夎揣
+// * true:鏈夎揣锛宖alse锛氭棤璐�
+// */
+// private Boolean loading = false;
/**
* 褰撳墠灏忚溅鐘舵�佹灇涓�
@@ -96,6 +104,26 @@
* Plc杈撳嚭鐘舵�両O
*/
private Short plcOutputStatusIO;
+
+ /**
+ * Plc杈撳嚭鐘舵�両O-椤跺崌浣�
+ */
+ private Boolean plcOutputLift;
+
+ /**
+ * Plc杈撳嚭鐘舵�両O-鎹㈠悜浣�
+ */
+ private Boolean plcOutputTransfer;
+
+ /**
+ * Plc杈撳嚭鐘舵�両O-鎶遍椄浣�
+ */
+ private Boolean plcOutputBrake;
+
+ /**
+ * Plc杈撳嚭鐘舵�両O-鍏呯數浣�
+ */
+ private Boolean plcOutputCharge;
/**
* 閿欒淇℃伅鐮�
@@ -261,10 +289,10 @@
if (!res) {
return res;
} else {
- // 鐢甸噺
+ // 鐢甸噺灏忎簬闃堝�兼垨鐢靛帇灏忎簬48V锛岄渶瑕佽繘琛屽厖鐢�
try {
Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
- return this.getBatteryPower$() < chargeLine;
+ return this.getBatteryPower$() < chargeLine || this.currentVoltage < 480;
} catch (Exception e) {
News.error("fail", e);
return false;
@@ -286,4 +314,13 @@
return currentLocMast.getLocNo();
}
+ public String getStatusErrorCode$() {
+ BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
+ BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(this.statusErrorCode.intValue());
+ if (basShuttleErr == null) {
+ return null;
+ }
+ return basShuttleErr.getErrName();
+ }
+
}
--
Gitblit v1.9.1