From 071dfa6efd150b84b00b26ca1887d5254084adbc Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Thu, 11 Sep 2025 14:59:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E5=90=8C=E6=97=B6=E5=88=9B=E5=BB=BA=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InstructionServiceImpl.java    | 17 +++++++++++++++--
 .../service/quartz/task/CreateDDJInst.java      |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

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<InstructionMapper,
             luceneExecuteLogService.deviceExecuteLog(logDto);
             throw e;
         }
+
         InstructionMybatis entity = ConvertUtil.convert(dto, InstructionMybatis.class);
-        instructionMapper.insert(entity);
-        instructions.add(dto);
+        if (entity.getNext_point_code().equals("RK1034")||entity.getNext_point_code().equals("RK1035")){
+            synchronized (this){
+                //判断有无对接位位为终点的指令
+                boolean present = instructions.stream().filter(a -> 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());