From 37a50634832b20de8589e4a02d527681d81b53c7 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期二, 15 三月 2022 14:51:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/SteProtocol.java |   65 ++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 20 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 7bd122b..1890496 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -1,7 +1,8 @@
 package com.zy.core.model.protocol;
 
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.core.enums.*;
+import com.zy.asrs.entity.BasSte;
+import com.zy.core.enums.SteHisTaskStatusType;
+import com.zy.core.enums.SteStatusType;
 import lombok.Data;
 
 /**
@@ -22,24 +23,25 @@
     public Short mode;
 
     /**
-     * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
-     * 0锛氱┖闂诧紝鏃犱换鍔�
-     * 1锛氬彇璐у畾浣嶄腑
-     * 2锛氬彇璐т腑
-     * 3锛氬彇璐у畬鎴愶紝鏀捐揣瀹氫綅涓�
-     * 4锛氭斁璐т腑
-     * 5锛氬洖鍘熺偣涓�
-     * 6锛氬弽鍘熺偣
-     * 7锛氬簱浣嶇Щ浣�
-     * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
-     * 99锛氭姤璀�
+     IDLE(0, "绌洪棽"),
+     MOVING(1, "浣滀笟涓�"),
+     SOS(2, "鎶ヨ"),
+     WAITING(3, "浠诲姟瀹屾垚绛夊緟WCS纭"),
      */
     public Short status;
 
-    /**
-     * 鐘舵�佹灇涓�
-     */
     public SteStatusType statusType;
+
+    /**
+     * 姝ｅ湪鎵ц浠诲姟
+     */
+    public Boolean execute;
+
+    /**
+     * 浠诲姟瀹屾垚锛岀瓑寰匴CS纭
+     */
+    public Boolean waiting;
+
 
     /**
      * 寮傚父鐮�1
@@ -56,6 +58,16 @@
      * 鐢垫睜鐢甸噺
      */
     public Short charge;
+
+    /**
+     * 婊＄數
+     */
+    public Boolean fullCharge;
+
+    /**
+     * 浣庣數閲�
+     */
+    public Boolean lowCharge;
 
     /**
      * 鐢垫睜棣堢數     0锛屾甯革紝1棣堢數
@@ -125,8 +137,11 @@
 
     /**
      * 杩囪处鎸囦护鐘舵��
+     * 0鍒濆 1鎵ц瀹屾垚 2鍒犻櫎
      */
     public Short hisTaskStatus;
+
+    public SteHisTaskStatusType hisTaskStatusType;
 
     /**
      * 鐩樼偣鏁伴噺
@@ -173,6 +188,16 @@
         this.status = SteStatusType.get(type).id.shortValue();
     }
 
+    public void setHisTaskStatus(Short hisTaskStatus){
+        this.hisTaskStatus = hisTaskStatus;
+        this.hisTaskStatusType = SteHisTaskStatusType.get(hisTaskStatus);
+    }
+
+    public void setHisTaskStatus(SteHisTaskStatusType type){
+        this.hisTaskStatusType = type;
+        this.hisTaskStatus = SteHisTaskStatusType.get(type).id.shortValue();
+    }
+
     /**
      * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
      *       I:鍏ュ簱
@@ -181,11 +206,11 @@
     private String lastIo = "I";
 
 
-    public BasCrnp toSqlModel(BasCrnp basCrnp){
+    public BasSte toSqlModel(BasSte basSte){
         if (alarm!=null) {
-            basCrnp.setCrnErr(alarm.longValue());
+            basSte.setSteErr(alarm.longValue());
         }
-        basCrnp.setWrkNo(taskNo);
-        return basCrnp;
+        basSte.setWrkNo(taskNo);
+        return basSte;
     }
 }

--
Gitblit v1.9.1