From ccbd60dafa896c7e477cd94e769197fce87c0aa6 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 27 Oct 2022 20:19:39 +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

---
 .../hand/assj/service/impl/SSJHandServiceImpl.java  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/assj/service/impl/SSJHandServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/assj/service/impl/SSJHandServiceImpl.java
index 0d15548..eda6332 100644
--- a/hd/nladmin-system/src/main/java/org/nl/hand/assj/service/impl/SSJHandServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/hand/assj/service/impl/SSJHandServiceImpl.java
@@ -926,18 +926,15 @@ public class SSJHandServiceImpl implements SSJHandService {
         3 强制完成*/
         if (type.equals("1")) {
             //调用agv删除任务的接口
+            agvService = SpringContextHolder.getBean("agvServiceImpl");
+            instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class);
 
             try {
-                //agvService.deleteAgvInst(instwo.getString("instruction_code"));
-                if (StrUtil.isEmpty(instdto.getAgv_jobno())) {
-                    instructionService.cancelNOSendAgv(inst_uuid);
-                } else {
-                    agvService.deleteAgvInst(instdto.getInstruction_code());
-                }
-
+                agvService.deleteAgvInst(instwo.getString("instruction_code"));
+                instructionService.cancel(inst_uuid);
             } catch (Exception e) {
                 jo.put("code", "2");
-                jo.put("desc", "下发agv失败");
+                jo.put("desc", e.getMessage());
                 jo.put("result", "");
                 return jo;
             }