From 32e505f8b1b93d58b91d633da70597fb7affd344 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 20 Dec 2023 08:49:13 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=94=B9=E7=89=A9=E6=96=99=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../instruction/service/impl/InstructionServiceImpl.java  | 1 +
 .../org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index ac092c6..c44c55a 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -783,6 +783,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         jo1.put("material_type", dto.getMaterial());
         jo1.put("batch", dto.getBatch());
         jo1.put("vehicle_code", dto.getVehicle_code());
+        jo1.put("source_device", dto.getStart_device_code());
 
         deviceService.changeDeviceStatus(jo1);
         LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java
index b08788c..49b5a8f 100644
--- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java
+++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java
@@ -109,11 +109,11 @@ public class QueryXZAgvTaskStatus {
                 }
             } else if ("STOPPED".equals(state) || "FAILED".equals(state) || "Error".equals(state)) {
                 if (inst != null) {
-//                    inst.setInstruction_status("1");
-//                    instructionService.update(inst);
+                    inst.setInstruction_status("1");
+                    instructionService.update(inst);
                     //任务失败时取消指令和任务
-                    instructionService.cancel(inst.getInstruction_id());
-                    taskService.cancel(inst.getTask_id());
+//                    instructionService.cancel(inst.getInstruction_id());
+//                    taskService.cancel(inst.getTask_id());
                 }
             }
 //             else if ("STOPPED".equals(state)){