diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 1b26824ba..466553614 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -596,9 +596,22 @@ public class InstructionServiceImpl extends CommonServiceImpl a.getNext_point_code().equals(entity.getNext_point_code())).findAny().isPresent(); + if (present){ + throw new BadRequestException("有DDJ对接位为终点的指令"); + } + instructionMapper.insert(entity); + instructions.add(dto); + } + }else { + instructionMapper.insert(entity); + instructions.add(dto); + } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java index ab391b66d..c9e0a8241 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java @@ -415,6 +415,7 @@ public class CreateDDJInst { } catch (Exception e) { taskDto.setRemark(e.getMessage()); taskserver.updateByCodeFromCache(taskDto); + return; } //创建指令后修改任务状态 taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex());