From b7e0039880d9f6e71230dbf9c13538de4f8135b8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 10 六月 2023 19:23:26 +0800
Subject: [PATCH] 输送线条码读取bug、出入库模式信号、链条控制信号

---
 src/main/java/com/zy/core/model/protocol/LiftProtocol.java |   88 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 87 insertions(+), 1 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 bbdc2f7..c471351 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,13 @@
 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;
 
@@ -21,6 +29,21 @@
     private Short taskNo = 0;
 
     /**
+     * 鍥涘悜绌挎杞﹀彿
+     */
+    private Short shuttleNo = 0;
+
+    /**
+     * 褰撳墠鎻愬崌鏈虹姸鎬侊紙鍐呴儴鑷垜缁存姢锛�
+     */
+    private Integer protocolStatus = 1;
+
+    /**
+     * 褰撳墠鎻愬崌鏈虹姸鎬佹灇涓�
+     */
+    private LiftProtocolStatusType protocolStatusType = LiftProtocolStatusType.IDLE;
+
+    /**
      * 灞�
      */
     private Short lev;
@@ -28,7 +51,7 @@
     /**
      * 鎻愬崌鏈洪攣瀹�
      */
-    private Short liftLock;
+    private Boolean liftLock;
 
     /**
      * 浣嶇疆鍒拌揪鍙嶉
@@ -161,4 +184,67 @@
      */
     private Short liftActualSpeed;
 
+    /**
+     * 浣滀笟鏍囪
+     */
+    private Boolean pakMk = true;
+
+    /**
+     * 鍥涘悜绌挎杞﹁皟搴︽彁鍗囨満鏃讹紝闇�瑕侀攣瀹氭鏍囪
+     */
+    private Boolean securityMk = false;
+
+    /**
+     * 浠诲姟鍛戒护
+     */
+    private LiftAssignCommand assignCommand;
+
+    public Short getLiftLockShortValue() {
+        return liftLock ? (short) 1 : (short) 0;
+    }
+
+    /**
+     * 璁剧疆鎻愬崌鏈虹姸鎬�
+     */
+    public void setProtocolStatus(Integer status) {
+        this.protocolStatus = status;
+        this.protocolStatusType = LiftProtocolStatusType.get(status);
+    }
+
+    /**
+     * 璁剧疆鎻愬崌鏈虹姸鎬�
+     */
+    public void setProtocolStatus(LiftProtocolStatusType status) {
+        this.protocolStatus = status.id;
+        this.protocolStatusType = status;
+    }
+
+    // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+    public Boolean isIdle() {
+        if(this.taskNo == null
+                || this.liftLock == null
+                || this.ready == null
+                || this.running == null
+                || this.mode == null
+                || this.pakMk == null
+        ){
+            return false;
+        }
+
+        boolean res = this.taskNo == 0
+                && !this.liftLock
+                && this.ready
+                && !this.running
+                && this.mode
+                && this.pakMk.equals(true)
+                && !this.securityMk
+                ;
+        return res;
+    }
+
+    public void setPositionArrivalFeedback(Short position) {
+        this.lev = position;//灞傞珮
+        this.positionArrivalFeedback = position;//浣嶇疆鍒拌揪鍙嶉
+    }
+
 }

--
Gitblit v1.9.1