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/LiftProtocol.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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 c471351..391a366 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -1,15 +1,11 @@
package com.zy.core.model.protocol;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasShuttleService;
-import com.zy.core.News;
import com.zy.core.enums.LiftProtocolStatusType;
-import com.zy.core.enums.ShuttleErrorCodeType;
-import com.zy.core.enums.ShuttleProtocolStatusType;
-import com.zy.core.enums.ShuttleStatusType;
import com.zy.core.model.command.LiftAssignCommand;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
/**
* 鎻愬崌鏈�
@@ -22,6 +18,11 @@
* 鎻愬崌鏈哄彿
*/
private Short liftNo;
+
+ /**
+ * 鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
+ */
+ private Short barcode = 1699;
/**
* 浠诲姟鍙�
@@ -199,6 +200,31 @@
*/
private LiftAssignCommand assignCommand;
+ /**
+ * 鍑哄叆搴撴ā寮忥紝1锛氬叆搴擄紝2锛氬嚭搴�
+ */
+ private Integer outInModel;
+
+ /**
+ * 鍑哄叆搴撴ā寮忚捣濮嬬珯鐐�
+ */
+ private Integer startSta;
+
+ /**
+ * 鍑哄叆搴撴ā寮忕洰鏍囩珯鐐�
+ */
+ private Integer distSta;
+
+ /**
+ * 鍑哄叆搴撴ā寮忔鏁�
+ */
+ private Integer outInModelStep;
+
+ /**
+ * 宸ヤ綔鏃堕棿
+ */
+ private Date wrkTime;
+
public Short getLiftLockShortValue() {
return liftLock ? (short) 1 : (short) 0;
}
@@ -233,7 +259,7 @@
boolean res = this.taskNo == 0
&& !this.liftLock
- && this.ready
+// && this.ready
&& !this.running
&& this.mode
&& this.pakMk.equals(true)
--
Gitblit v1.9.1