diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
index 149aa78..cad902d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
@@ -134,9 +134,17 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                     }
                     if (ikey != 0) {
                         inst = instructionService.findByCodeFromCache(String.valueOf(ikey));
-//                        if (ObjectUtil.isEmpty(inst)) {
-//                            inst = instructionService.findByCode(String.valueOf(ikey));
-//                        }
+                        if (ObjectUtil.isEmpty(inst)) {
+                            inst = instructionService.findByCode(String.valueOf(ikey));
+                            if(inst!=null) {
+                                log.info(inst.toString());
+                                //如果任務已完成或已取消則置為空
+                                if (!"0".equals(inst.getInstruction_status()) &&
+                                        !"1".equals(inst.getInstruction_status())) {
+                                    inst = null;
+                                }
+                            }
+                        }
                     }
                     if (!ObjectUtil.isEmpty(link_inst)) {
                         link_flag = true;
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 2f2b003..1d36e4f 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
@@ -70,6 +70,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
 
     @Override
     public CancelTaskResponse cancelFromWms(List<CancelTaskRequest> reqs) throws Exception {
+        log.info("cancelFromWms--------------:输入参数：" + reqs);
         ParamService paramService = SpringContextHolder.getBean(ParamService.class);
         InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class);
         CancelTaskResponse response = new CancelTaskResponse();
@@ -84,7 +85,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             }
             TaskDto taskDto = taskService.findByCodeFromCache(task_code);
             String cancelTaskCheck = paramService.findByCode(AcsConfig.CANCELTASKCHECK).getValue();
-
+            if(taskDto==null){
+                log.info("任务已完成或取消");
+            }else {
 //            if (StrUtil.equals(cancelTaskCheck, "1")) {
 //                taskService.cancelNoSendWms(taskDto.getTask_id());
 //            } else if (StrUtil.equals(cancelTaskCheck, "0")) {
@@ -92,10 +95,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 if (inst != null) {
                     instructionService.cancel(inst.getInstruction_id());
                 }
-                    taskService.cancelNoSendWms(taskDto.getTask_id());
+                taskService.cancelNoSendWms(taskDto.getTask_id());
 //                } else {
 //                    throw new RuntimeException("指令正在执行中,操作失败!");
 //                }
+            }
 
         }