From 3df88a39bfae379ae921eae344f36efb1c495d58 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Fri, 11 Oct 2024 22:32:52 +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

---
 .../instruction/service/impl/InstructionServiceImpl.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 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 f435b59..9144650 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
@@ -1036,15 +1036,13 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
                     StrUtil.equals(entity.getInstruction_type(), "3")) {
                 ZheDaAgvService zheDaAgvService = SpringContextHolder.getBean(ZheDaAgvService.class);
                 HttpResponse result = zheDaAgvService.deleteZDAgvInst(entity.getInstruction_code());
-                if (result.getStatus() == 200) {
-                    flag = true;
-                } else {
+                if (result.getStatus() != 200) {
+                    flag = false;
                     log.error("下发rgv取消指令动作失败,下发AGV/RGV任务失败！任务id为:{},指令号为:{}，失败原因{}", task.getTask_id(), entity.getInstruction_code(), "AGV/RGV未响应！");
                     if (task != null) {
                         task.setRemark("下发rgv取消指令动作失败！失败原因: 连接AGV/RGV未响应！");
                         taskService.update(task);
                     }
-                    flag = false;
                 }
                 if (flag) {
                     String currentUsername = SecurityUtils.getCurrentUsername();