From d2f39514777583ebb2b5373a935c5b34bceb47c5 Mon Sep 17 00:00:00 2001 From: pangshenghao Date: Fri, 16 Jun 2023 16:12:37 +0800 Subject: [PATCH] =?UTF-8?q?1.0xFF=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B9=B6=E4=B8=8A=E9=80=81wms=EF=BC=8C?= =?UTF-8?q?=E4=B8=8Ewms=E4=BF=9D=E6=8C=81=E7=8A=B6=E6=80=81=E4=B8=80?= =?UTF-8?q?=E8=87=B4=202.=E5=A6=82=E6=9E=9C=E6=8C=87=E4=BB=A4=E5=B7=B2?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=88=96=E5=8F=96=E6=B6=88=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=9F=A5=E8=AF=A2=E5=AF=BC=E8=87=B4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E8=A2=AB=E8=A6=86=E7=9B=96=203.?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E5=8E=86=E5=8F=B2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=813=E5=8F=96?= =?UTF-8?q?=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auto/run/OneNDCSocketConnectionAutoRun.java | 15 +++++++++------ .../src/views/acs/history/instRecord/index.vue | 1 + .../src/views/acs/history/taskRecord/index.vue | 1 + .../views/acs/history/taskTreeRecord/index.vue | 1 + 4 files changed, 12 insertions(+), 6 deletions(-) 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 a7683ae..149aa78 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 @@ -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 { diff --git a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue index e5cf3a9..6dc3782 100644 --- a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue @@ -104,6 +104,7 @@ 就绪 执行中 完成 + 取消 diff --git a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue index 72722e3..a8f24dc 100644 --- a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue @@ -237,6 +237,7 @@ 就绪 执行中 完成 + 取消 diff --git a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue index 4db587a..9321ad4 100644 --- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue @@ -94,6 +94,7 @@ 就绪 执行中 完成 + 取消