From 52a3d2b51c7ca58abcb0e31783671af98d526aef Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 22 十二月 2023 12:17:23 +0800
Subject: [PATCH] #检料盘点工作档更新
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
index f323bc4..e64959d 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -1,5 +1,8 @@
package com.zy.core.model.protocol;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasLiftErr;
+import com.zy.asrs.service.BasLiftErrService;
import com.zy.core.enums.LiftProtocolStatusType;
import com.zy.core.model.command.LiftAssignCommand;
import lombok.Data;
@@ -93,6 +96,11 @@
private Boolean deviceError;
/**
+ * 鏁呴殰鐮�
+ */
+ private Short errorCode;
+
+ /**
* 浠诲姟鍦板潃
*/
private Short taskAddress;
@@ -130,6 +138,11 @@
private LiftAssignCommand assignCommand;
/**
+ * 鎸囦护涓嬪彂鏃堕棿
+ */
+ private Long sendTime = 0L;
+
+ /**
* 璁剧疆鎻愬崌鏈虹姸鎬�
*/
public void setProtocolStatus(Integer status) {
@@ -147,20 +160,22 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle(Short taskNo) {
- if(this.taskNo == null
- || this.busy == null
+ if(this.busy == null
|| this.model == null
|| this.deviceError == null
|| this.pakMk == null
+ || this.token == null
){
return false;
}
- boolean res = (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
- && !this.busy
+ boolean res =
+// (this.taskNo.equals(this.completeTaskNo) || this.taskNo.intValue() == taskNo.intValue())
+ !this.busy
&& this.model
&& !this.pakMk
&& !this.deviceError
+ && this.protocolStatusType.equals(LiftProtocolStatusType.IDLE)
;
return res;
}
@@ -177,12 +192,14 @@
return false;
}
- boolean res = this.taskNo == 0
- && !this.busy
+ boolean res =
+// this.taskNo.equals(this.completeTaskNo)
+ !this.busy
&& this.model
&& !this.pakMk
&& !this.deviceError
&& this.token == 0
+ && this.protocolStatusType.equals(LiftProtocolStatusType.IDLE)
;
return res;
}
@@ -205,5 +222,17 @@
return res;
}
+ public String getErrCode$() {
+ if (this.errorCode == null) {
+ return "";
+ }
+ BasLiftErrService basLiftErrService = SpringUtils.getBean(BasLiftErrService.class);
+ BasLiftErr basLiftErr = basLiftErrService.selectById(this.errorCode);
+ if (basLiftErr == null) {
+ return String.valueOf(this.errorCode);
+ }
+ return basLiftErr.getErrName();
+ }
+
}
--
Gitblit v1.9.1