From c5c0a5cda6972954faf80f725e7a5fb2b6a1aea7 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Fri, 16 Sep 2022 17:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auto/run/NDCSocketConnectionAutoRun.java   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
index dc7f89a..d6836ea 100644
--- a/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
+++ b/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
@@ -965,6 +965,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                             if (response.getStatus() == 200) {
                                                 JSONObject jo = JSONObject.fromObject(response.body());
                                                 if (StrUtil.equals(jo.get("result").toString(), "1")) {
+                                                    log.info("AGV取货完成请求请求立库：{}", jo.toString());
                                                     data = AgvService.sendAgvOneModeInst(phase, index, 0);
                                                 } else {
                                                     log.info("AGV取货完成反馈设备{},{}", device_code, jo.getString("message"));
@@ -1120,6 +1121,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                         //如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
                                         if (!tag) {
                                             HttpResponse response = acsToXrlkService.isPutPermission(device.getDevice_code());
+                                            log.info("AGV请求放货请求立库：{}", response.toString());
                                             if (response.getStatus() == 200) {
                                                 JSONObject jo = JSONObject.fromObject(response.body());
                                                 if (StrUtil.equals(jo.get("result").toString(), "1")) {
@@ -1298,8 +1300,11 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                         //如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
                                         if (!tag) {
                                             HttpResponse response = acsToXrlkService.AGVWorkStatus(device.getDevice_code(), "1");
+                                            log.info("AGV放货完成请求请求立库：{}", response.toString());
                                             if (response.getStatus() == 200) {
                                                 JSONObject jo = JSONObject.fromObject(response.body());
+                                                log.info("AGV放货完成请求请求立库：{}", jo.toString());
+
                                                 if (StrUtil.equals(jo.get("result").toString(), "1")) {
                                                     data = AgvService.sendAgvOneModeInst(phase, index, 0);
                                                 } else {
@@ -1368,6 +1373,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                                 HttpResponse response = acsToXrlkService.invokeDoor(device.getDevice_code());
                                                 if (response.getStatus() == 200) {
                                                     JSONObject jo = JSONObject.fromObject(response.body());
+                                                    log.info("AGV请求进入立库反馈{}", jo.toString());
                                                     if (StrUtil.equals(jo.get("result").toString(), "1")) {
                                                         data = AgvService.sendAgvOneModeInst(phase, index, 0);
                                                     } else {
@@ -1424,12 +1430,12 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                     if (arr[18] * 256 + arr[19] == 0) {
                                         dto.setState("IDLE");
                                     } else {
-                                        StringBuffer errbs = new StringBuffer();
-                                        for (int i = 0; i < ERROR.length; i++) {
-                                            if (((arr[18] * 256 + arr[19]) & (1 << i)) > 0)
-                                                errbs.append("," + ERROR[i]);
-                                            //反馈故障
-                                        }
+//                                        StringBuffer errbs = new StringBuffer();
+//                                        for (int i = 0; i < ERROR.length; i++) {
+//                                            if (((arr[18] * 256 + arr[19]) & (1 << i)) > 0)
+//                                                errbs.append("," + ERROR[i]);
+//                                            //反馈故障
+//                                        }
                                         dto.setState("ERROR");
                                     }
                                 }