From 08bc0e947396694394dda893d8da1bcc03b2a673 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 16 Jun 2023 09:38:49 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=B8=80=E6=A5=BCagv=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/instruction/service/impl/InstructionServiceImpl.java | 1 -
 .../org/nl/modules/quartz/task/QueryOneZDAgvTaskStatus.java     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 87b7dd6..9b46800 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -257,7 +257,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void create(Instruction dto) throws Exception {
         dto = foramte(dto);
         String task_code = dto.getTask_code();
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryOneZDAgvTaskStatus.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryOneZDAgvTaskStatus.java
index 9245853..820e04b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryOneZDAgvTaskStatus.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryOneZDAgvTaskStatus.java
@@ -62,7 +62,7 @@ public class QueryOneZDAgvTaskStatus {
 //							UNROUTABLE：无法规划该业务订单的执行路线
 
                 //执行中
-                if ("BEING_PROCESSED".equals(state)) {
+                if ("BEING_PROCESSED".equals(state) || "ACTIVE".equals(state)) {
                     if (inst != null) {
                         inst.setInstruction_status("1");
                         instructionService.update(inst);