From b2c183cd86a022fd52a4a3947f7a95ad1fdae7d3 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 22 Mar 2023 17:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java     | 8 +++++---
 .../nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java  | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index 09eb276..014819a 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -63,8 +63,10 @@ public class NDCAgvServiceImpl implements NDCAgvService {
             };
             log.info("下发删除AGV指令--{}", Bytes2HexString(b));
 
-//                NDCSocketConnectionAutoRun.write(b);
+            OneNDCSocketConnectionAutoRun.write(b);
             System.out.println("下发删除agv指令数据:" + Bytes2HexString(b));
+        } else {
+            log.info("下发AGV删除指令失败:{}", "参数表中forkagv值不等于1");
         }
 
     }
@@ -214,9 +216,9 @@ public class NDCAgvServiceImpl implements NDCAgvService {
         };
         log.info("下发AGV充电任务--{}", str1);
 
-        try{
+        try {
             OneNDCSocketConnectionAutoRun.write(b);
-        } catch (Exception e){
+        } catch (Exception e) {
             e.getMessage();
             return false;
         }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index 64ec82f..9cc56ee 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -130,9 +130,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                             .header("Content-Type", "application/json")
                             .body(String.valueOf(reqData))
                             .execute();
-                    log.info("反馈WMS任务状态,请求参数:{},响应参数:{}", String.valueOf(reqData), String.valueOf(result));
+                    log.info("反馈WMS任务状态,请求路径:{},请求参数:{},响应参数:{}", url + taskcode, String.valueOf(reqData), String.valueOf(result));
                 } catch (Exception e) {
-                    log.error("反馈WMS任务状态,请求参数:{},响应参数:{}", String.valueOf(reqData), e.getMessage());
+                    log.error("反馈WMS任务状态,请求路径:{},请求参数:{},响应参数:{}", url + taskcode, String.valueOf(reqData), e.getMessage());
                 }
             }
             String type = "";
@@ -567,9 +567,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             result = HttpRequest.post(url + "?token=" + token)
                     .body(JSON.toJSONString(from))
                     .execute();
-            log.info("反馈WMS取放货状态,请求参数:{},响应参数:{}", JSON.toJSONString(from), String.valueOf(result));
+            log.info("反馈WMS取放货状态,请求路径:{},请求参数:{},响应参数:{}", url, JSON.toJSONString(from), String.valueOf(result));
         } catch (Exception e) {
-            log.info("反馈WMS取放货状态,请求参数:{},响应参数:{}", JSON.toJSONString(from), e.getMessage());
+            log.info("反馈WMS取放货状态,请求路径:{},请求参数:{},响应参数:{}", url, JSON.toJSONString(from), e.getMessage());
         }
         return result;
     }