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/ShuttleProtocol.java |   64 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 302507e..99b40c0 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -1,7 +1,11 @@
 package com.zy.core.model.protocol;
 
 import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasShuttleErr;
 import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasShuttleErrService;
 import com.zy.asrs.service.BasShuttleService;
 import com.zy.asrs.service.LocMastService;
 import com.zy.core.News;
@@ -96,6 +100,26 @@
      * Plc杈撳嚭鐘舵�両O
      */
     private Short plcOutputStatusIO;
+
+    /**
+     * Plc杈撳嚭鐘舵�両O-椤跺崌浣�
+     */
+    private Boolean plcOutputLift;
+
+    /**
+     * Plc杈撳嚭鐘舵�両O-鎹㈠悜浣�
+     */
+    private Boolean plcOutputTransfer;
+
+    /**
+     * Plc杈撳嚭鐘舵�両O-鎶遍椄浣�
+     */
+    private Boolean plcOutputBrake;
+
+    /**
+     * Plc杈撳嚭鐘舵�両O-鍏呯數浣�
+     */
+    private Boolean plcOutputCharge;
 
     /**
      * 閿欒淇℃伅鐮�
@@ -222,6 +246,9 @@
             // 鐢甸噺
             try {
                 Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
+                if (chargeLine == null) {
+                    return false;
+                }
                 return this.getBatteryPower$() > chargeLine;
             } catch (Exception e) {
                 News.error("fail", e);
@@ -253,6 +280,10 @@
 
     // 鏄惁婊¤冻鍏呯數鐘舵��
     public Boolean isRequireCharge() {
+        if (this.busyStatusType == null || this.pakMk == null || this.errorCodeType == null || this.taskNo == null) {
+            return false;
+        }
+
         boolean res = this.busyStatusType.equals(ShuttleStatusType.IDLE)
                 && this.pakMk.equals(true)
                 && this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
@@ -261,10 +292,10 @@
         if (!res) {
             return res;
         } else {
-            // 鐢甸噺
+            // 鐢甸噺灏忎簬闃堝�兼垨鐢靛帇灏忎簬48V锛岄渶瑕佽繘琛屽厖鐢�
             try {
                 Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
-                return this.getBatteryPower$() < chargeLine;
+                return this.getBatteryPower$() < chargeLine || this.currentVoltage < 480;
             } catch (Exception e) {
                 News.error("fail", e);
                 return false;
@@ -286,4 +317,33 @@
         return currentLocMast.getLocNo();
     }
 
+    public String getStatusErrorCode$() {
+        BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
+        BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(this.statusErrorCode.intValue());
+        if (basShuttleErr == null) {
+            return null;
+        }
+        return basShuttleErr.getErrName();
+    }
+
+    public void setCurrentCode(Short currentCode) {
+        this.currentCode = currentCode;
+        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+        if (locMastService != null) {
+            LocMast locMast = locMastService.queryByQrCode(currentCode.toString());
+            if (locMast == null) {
+                //鏌ヤ笉鍒板簱浣嶅彿锛屾煡璇㈡槸鍚︿负绔欑偣
+                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+                if (basDevpService != null) {
+                    BasDevp basDevp = basDevpService.queryByLocNo(currentCode.toString());
+                    if (basDevp != null) {
+                        this.locNo = basDevp.getLocNo();
+                    }
+                }
+            }else{
+                this.locNo = locMast.getLocNo();
+            }
+        }
+    }
+
 }

--
Gitblit v1.9.1