From a18ed78675d0f7745ed1ebe519bfe0aa64c97dfe Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 20 九月 2023 15:02:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
index dcde899..a8f7fa4 100644
--- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
@@ -3,17 +3,17 @@
 import com.alibaba.fastjson.JSON;
 import com.core.common.SpringUtils;
 import com.zy.asrs.entity.BasShuttle;
+import com.zy.asrs.entity.BasShuttleErr;
+import com.zy.asrs.service.BasShuttleErrService;
 import com.zy.asrs.service.BasShuttleService;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.utils.NavigatePositionConvert;
 import com.zy.core.News;
-import com.zy.core.enums.ShuttleErrorCodeType;
 import com.zy.core.enums.ShuttleProtocolStatusType;
 import com.zy.core.enums.ShuttleStatusType;
 import com.zy.core.model.command.ShuttleAssignCommand;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
 
 /**
  * 鐗涚溂鍥涘悜绌挎杞�
@@ -163,6 +163,11 @@
     private NyShuttlePointClass coord;
 
     /**
+     * WCS搴撲綅xyz
+     */
+    private NyShuttlePointClass wcsPoint;
+
+    /**
      * 浠诲姟鐩殑搴撲綅xyztaskId(姝ｅ湪鍔ㄤ綔鐨勪换鍔D)lastTaskId(鏈�鍚庝竴涓畬鎴愮殑浠诲姟ID)recentTaskId(鏀跺埌鐨勬渶鍚庝竴涓换鍔D)
      */
     private TaskClass task;
@@ -180,7 +185,7 @@
     /**
      * 鏁呴殰鐮�
      */
-    private List<Integer> errCode;
+    private Integer errCode;
 
     /**
      * mileage鎬婚噷绋嬫暟(绫�)锛宭iftNumber椤跺崌鎬绘暟dropNumber涓嬮檷鎬绘暟reversingX鎹鎬绘暟reversingY鎹鎬绘暟
@@ -229,7 +234,14 @@
         if (this.getFree() == null) {
             return "";
         }
-        return this.getFree() == 1 ? "绌洪棽" : "杩愯涓�";
+        return this.getFree() == 0 ? "杩愯涓�" : "绌洪棽";
+    }
+
+    public String getWorkingMode$() {
+        if (this.getWorkingMode() == null) {
+            return "";
+        }
+        return this.getWorkingMode() == 0 ? "鎵嬪姩" : "鑷姩";
     }
 
     public String getLoadState$() {
@@ -258,7 +270,7 @@
             return "";
         }
 
-        switch (this.getRunDir()) {
+        switch (this.getLiftPosition()) {
             case 0:
                 return "鏈煡";
             case 1:
@@ -387,6 +399,13 @@
         return NavigatePositionConvert.nyXyzToLocNo(this.getPoint().getX(), this.getPoint().getY(), this.getPoint().getZ());
     }
 
+    public String getPoint$$() {
+        if (this.getPoint() == null) {
+            return "";
+        }
+        return JSON.toJSONString(this.getPoint());
+    }
+
     public String getCoord$() {
         if (this.getCoord() == null) {
             return "";
@@ -394,10 +413,27 @@
         return JSON.toJSONString(this.getCoord());
     }
 
+    public String getErrCode$() {
+        if (this.getErrCode() == null) {
+            return "";
+        }
+        BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
+        BasShuttleErr basShuttleErr = basShuttleErrService.selectById(this.getErrCode());
+        if (basShuttleErr == null) {
+            return this.getErrCode().toString();
+        }
+        return basShuttleErr.getErrName();
+    }
+
     public void setPoint(NyShuttlePointClass point) {
         String locNo = NavigatePositionConvert.nyXyzToLocNo(point.getX(), point.getY(), point.getZ());
         this.point = point;
         this.currentLocNo = locNo;
+        NyShuttlePointClass wcsPoint = new NyShuttlePointClass();
+        wcsPoint.setX(Utils.getRow(locNo));
+        wcsPoint.setY(Utils.getBay(locNo));
+        wcsPoint.setZ(Utils.getLev(locNo));
+        this.wcsPoint = wcsPoint;
     }
 
     // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
@@ -458,6 +494,17 @@
         return res;
     }
 
+    // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+    public Boolean isIdleNoCharge(int taskNo) {
+        boolean res = this.free == ShuttleStatusType.IDLE.id
+                && !this.pakMk
+                && this.errState == 0
+                && (this.taskNo == 0 || this.taskNo == taskNo)
+                && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
+                ;
+        return res;
+    }
+
     // 鏄惁婊¤冻鍏呯數鐘舵��
     public Boolean isRequireCharge() {
         if (this.free == null || this.pakMk == null || this.errState == null || this.taskNo == null) {

--
Gitblit v1.9.1