1.0xFF同时删除任务并上送wms，与wms保持状态一致

2.如果指令已完成或取消，不再次查询导致任务状态被覆盖
3.界面优化历史查询增加状态3取消

acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@@ -14,6 +14,8 @@ import org.nl.acs.instruction.service.impl.InstructionServiceImpl;
 import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.task.service.TaskService;
+import org.nl.acs.task.service.impl.TaskServiceImpl;
 import org.nl.modules.system.service.ParamService;
 import org.nl.modules.system.service.impl.ParamServiceImpl;
 import org.nl.modules.wql.util.SpringContextHolder;
@@ -76,6 +78,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
         DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class);
         DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class);
         DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
+        TaskService taskService = SpringContextHolder.getBean(TaskServiceImpl.class);
         ip = paramService.findByCode(AcsConfig.AGVURL).getValue();
         port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());
 
@@ -131,9 +134,9 @@ 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 (!ObjectUtil.isEmpty(link_inst)) {
                         link_flag = true;
@@ -178,10 +181,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                     else if (phase == 0xFF) {
 
                         if (!ObjectUtil.isEmpty(inst)) {
-                            if (!ObjectUtil.isEmpty(inst)) {
-                                instructionService.cancelNOSendAgv(inst.getInstruction_id());
-                            }
+                            instructionService.cancelNOSendAgv(inst.getInstruction_id());
+                            taskService.cancel(inst.getTask_id());
                         }
+
                         data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
 
                     } else {

acs/nladmin-ui/src/views/acs/history/instRecord/index.vue

@@ -104,6 +104,7 @@
             <span v-if="scope.row.instruction_status=='0' ">就绪</span>
             <span v-if="scope.row.instruction_status=='1' ">执行中</span>
             <span v-if="scope.row.instruction_status=='2' ">完成</span>
+            <span v-if="scope.row.instruction_status=='3' ">取消</span>
           </template>
         </el-table-column>
         <el-table-column prop="start_point_code" label="起点" />

acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue

@@ -237,6 +237,7 @@
             <span v-if="scope.row.task_status=='0' ">就绪</span>
             <span v-if="scope.row.task_status=='1' ">执行中</span>
             <span v-if="scope.row.task_status=='2' ">完成</span>
+            <span v-if="scope.row.task_status=='3' ">取消</span>
           </template>
         </el-table-column>
         <el-table-column prop="priority" label="任务优先级" />

acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue

@@ -94,6 +94,7 @@
             <span v-if="scope.row.task_status=='0' ">就绪</span>
             <span v-if="scope.row.task_status=='1' ">执行中</span>
             <span v-if="scope.row.task_status=='2' ">完成</span>
+            <span v-if="scope.row.task_status=='3' ">取消</span>
           </template>
         </el-table-column>
         <el-table-column prop="priority" label="任务优先级" />