diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index fc74800..2f2b003 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -90,7 +90,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
 //            } else if (StrUtil.equals(cancelTaskCheck, "0")) {
                 Instruction inst = instructionService.findByTaskcode(task_code);
                 if (inst != null) {
-                    instructionService.cancelNOSendAgv(inst.getInstruction_id());
+                    instructionService.cancel(inst.getInstruction_id());
                 }
                     taskService.cancelNoSendWms(taskDto.getTask_id());
 //                } else {
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 27fdc1e..d13c219 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
@@ -879,11 +879,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
 
         } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "2")) {
             // NDC agv指令不当场取消指令,需要等agv上报
-            if (!StrUtil.isEmpty(entity.getAgv_jobno())) {
                 ndcAgvService.deleteAgvInstToNDC(entity);
-            } else {
                 flag = true;
-            }
         } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")
                 && !StrUtil.equals(entity.getSend_status(), "2")) {
             XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);