From 634f691354a519fbae4714b20dbc9e89030657b8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 九月 2022 10:06:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 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 cab04bd..201d49d 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -1,15 +1,19 @@
package com.zy.core.model.protocol;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.service.BasSteService;
import com.zy.core.enums.SteHisTaskStatusType;
import com.zy.core.enums.SteLocaType;
import com.zy.core.enums.SteStatusType;
import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
/**
* Created by vincent on 2020/8/7
*/
+@Slf4j
@Data
public class SteProtocol {
@@ -181,6 +185,11 @@
*/
public Short crnAllowRun;
+ /**
+ * 鍏呯數鐘舵�� 1锛氬湪鍏呯數锛�0锛氫笉鍦ㄥ厖鐢�
+ */
+ private Short chargeStatus;
+
public void setStatus(Short status){
this.status = status;
this.statusType = SteStatusType.get(status);
@@ -225,23 +234,38 @@
basSte.setSteErr(alarm.longValue());
}
basSte.setWrkNo(taskNo.intValue());
- if (!Cools.isEmpty(row)) {
- basSte.setRow(row.intValue());
- }
- if (!Cools.isEmpty(bay)) {
- basSte.setBay(bay.intValue());
- }
- if (!Cools.isEmpty(lev)) {
- basSte.setLev(lev.intValue());
- }
+// if (basSte.getPakMk().equals("N")) {
+// if (!Cools.isEmpty(row)) {
+// basSte.setRow(row.intValue());
+// }
+// if (!Cools.isEmpty(bay)) {
+// basSte.setBay(bay.intValue());
+// }
+// if (!Cools.isEmpty(lev)) {
+// basSte.setLev(lev.intValue());
+// }
+// }
return basSte;
}
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle() {
- return this.statusType.equals(SteStatusType.IDLE)
+ boolean res = this.statusType.equals(SteStatusType.IDLE)
&& this.pakMk.equals("N")
- && !isAlarm();
+ && !isAlarm()
+ && this.chargeStatus == 0;
+ if (!res) {
+ return res;
+ } else {
+ // 鐢甸噺
+ try {
+ String chargeLine = SpringUtils.getBean(BasSteService.class).selectById(this.steNo).getChargeLine();
+ return charge > Float.parseFloat(chargeLine);
+ } catch (Exception e) {
+ log.error("fail", e);
+ return false;
+ }
+ }
}
// 鏄惁澶勪簬鎶ヨ鐘舵��
--
Gitblit v1.9.1