From 290517bf5b0db5e9ecadebae7af1fb023dfc4fb8 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Sat, 12 Oct 2024 14:14:59 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InstructionServiceImpl.java         | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 9144650..1d79e6a 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -587,22 +587,18 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
                         dto.setSend_status("2");
                         dto.setRemark("失败原因:"+jo.getString("message"));
                         log.error("创建指令,下发AGV/RGV任务失败！任务id为:{},指令号为:{}，失败原因{}", task.getTask_id(), dto.getInstruction_code(), jo.getString("message"));
-                        if (task != null) {
-                            task.setRemark("创建指令,下发AGV/RGV任务失败！失败原因{}" + jo.getString("message"));
-                            taskService.update(task);
-                        }
+                        task.setRemark("创建指令,下发AGV/RGV任务失败！失败原因{}" + jo.getString("message"));
                     } else {
                         dto.setSend_status("1");
+                        task.setRemark("");
                     }
                 } else {
                     dto.setSend_status("2");
                     dto.setRemark("失败原因:AGV/RGV未响应！");
                     log.error("创建指令,下发AGV/RGV任务失败！任务id为:{},指令号为:{}，失败原因{}", task.getTask_id(), dto.getInstruction_code(), "AGV/RGV未响应！");
-                    if (task != null) {
-                        task.setRemark("创建指令,下发AGV/RGV任务失败！失败原因: AGV/RGV未响应！");
-                        taskService.update(task);
-                    }
+                    task.setRemark("创建指令,下发AGV/RGV任务失败！失败原因: AGV/RGV未响应！");
                 }
+                taskService.update(task);
             }
         } catch (Exception e) {
             dto.setRemark("失败原因:"+e.getMessage());