From 55ff01279baccdebd2ced83b016c415b00b6bb7a Mon Sep 17 00:00:00 2001 From: pangshenghao Date: Thu, 15 Jun 2023 16:44:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=87=E4=BB=A4=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=B8=8B=E5=8F=91ndc=EF=BC=8C=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=BC=82=E6=AD=A5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 2 +- .../acs/instruction/service/impl/InstructionServiceImpl.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) 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);