更新

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;
             }