From f99cd59b1da32f74110661d643879a7a5f865d70 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 19 六月 2024 09:53:17 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java |   88 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
index 835a6d8..1766542 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
@@ -63,9 +63,9 @@
         try {
             readStatus();
 
-            //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓篺alse
+            //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓簍rue
             if (liftProtocol.getRun()) {
-                liftProtocol.setPakMk(false);
+                liftProtocol.setPakMk(true);
             }
         } catch (Exception e) {
             OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戣鍙栨彁鍗囨満鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
@@ -345,12 +345,43 @@
         // 鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔ㄣ�佸氨缁�佺┖闂层�佹湭閿佸畾
         if (this.liftProtocol.getModel()
                 && !this.liftProtocol.getRun()
+                && this.liftProtocol.getPakMk()
                 && this.liftProtocol.getReady()
-//                && this.liftProtocol.getPakMk()
                 && this.liftProtocol.getErrorCode().equals("0")
-                && this.liftProtocol.getProtocolStatusType().equals(LiftProtocolStatusType.IDLE)
+                && (this.liftProtocol.getProtocolStatusType().equals(LiftProtocolStatusType.IDLE)
+                || this.liftProtocol.getProtocolStatusType().equals(LiftProtocolStatusType.WAITING))
                 && !extend.getLock()
         ) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isDeviceIdle() {
+        return isDeviceIdle(null);
+    }
+
+    @Override
+    public boolean isDeviceIdle(ExecuteSupport support) {
+        if (null != support) {
+            Boolean judgement = support.judgement();
+            if (judgement != null && !judgement) {
+                return true;
+            }
+        }
+
+        // 鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔ㄣ�佸氨缁�佺┖闂�
+        if (this.liftProtocol.getModel()
+                && !this.liftProtocol.getRun()
+                && this.liftProtocol.getErrorCode().equals("0")
+        ) {
+            if (this.liftProtocol.getTaskNo() == 0) {
+                //鏃犱换鍔℃儏鍐典笅妫�娴嬫槸鍚﹀氨缁�
+                if (!this.liftProtocol.getReady()) {
+                    return false;
+                }
+            }
             return true;
         }
         return false;
@@ -372,6 +403,36 @@
     public boolean isLock(ExecuteSupport support) {
         InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
         return extend.getLock();
+    }
+
+    @Override
+    public boolean commandFinished(Integer taskNo) {
+        try {
+            LiftCommand command = getTaskClearCommand();
+            String loginToken = requestLoginToken();
+            if (loginToken == null) {
+                return false;
+            }
+
+            HashMap<String, Object> headers = new HashMap<>();
+            headers.put("Authorization", "Bearer " + loginToken);
+
+            String response = new HttpHandler.Builder()
+                    .setUri(API_URL)
+                    .setPath("/RDS/lifterOperation")
+                    .setHeaders(headers)
+                    .setJson(command.getBody())
+                    .build()
+                    .doPost();
+            JSONObject jsonObject = JSON.parseObject(response);
+            Integer code = jsonObject.getInteger("code");
+            if (code.equals(200)) {
+                return true;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
     }
 
     //***************璁惧灞傞�氳-涓嶅悓鍘傚晢璁惧閫氳鏂规涓嶄竴鑷�***************
@@ -448,6 +509,8 @@
         body.put("taskId", taskNo);
         body.put("startLayer", 0);
         body.put("endLayer", targetLev);
+        body.put("startLocation", 0);
+        body.put("endLocation", 0);
         body.put("model", taskMode);
 
         LiftCommand command = new LiftCommand();
@@ -469,6 +532,8 @@
         body.put("taskId", taskNo);
         body.put("startLayer", sourceLev);
         body.put("endLayer", targetLev);
+        body.put("startLocation", 0);
+        body.put("endLocation", 0);
         body.put("model", 2);//杞借溅绉诲姩
 
         LiftCommand command = new LiftCommand();
@@ -540,6 +605,21 @@
         return command;
     }
 
+    //鑾峰彇鎻愬崌鏈轰换鍔℃竻闄ゅ懡浠�
+    private LiftCommand getTaskClearCommand() {
+        HashMap<String, Object> body = new HashMap<>();
+        body.put("messageName", "lifterOperation");
+        body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        body.put("deviceNo", Integer.parseInt(this.device.getDeviceNo()));
+        body.put("operation", 1);
+
+        LiftCommand command = new LiftCommand();
+        command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
+        command.setBody(JSON.toJSONString(body));
+        command.setMode(LiftCommandModeType.RESET.id);
+        return command;
+    }
+
     /**
      * 鎵╁睍瀛楁
      */

--
Gitblit v1.9.1