From 81b652984e4ea10ce03c1a3ec40db8425a5bfc57 Mon Sep 17 00:00:00 2001
From: liejiu946 <liejiu946@163.com>
Date: Fri, 27 Jun 2025 14:57:29 +0800
Subject: [PATCH] =?UTF-8?q?opt:=201.=E8=A7=A3=E5=86=B3=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8C=87=E4=BB=A4=E6=97=B6=EF=BC=8C=E5=86=85?=
 =?UTF-8?q?=E5=AD=98=E4=B8=AD=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF=E4=B8=BA?=
 =?UTF-8?q?NULL=E5=AF=BC=E8=87=B4=E7=A9=BA=E6=8C=87=E9=92=88=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InstructionServiceImpl.java        | 13 ++++---------
 .../nl/acs/task/service/impl/TaskServiceImpl.java   |  1 +
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 2d09a59..310071d 100644
--- a/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -594,6 +594,10 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         dto = foramte(dto);
         String task_code = dto.getTask_code();
         TaskDto task = taskService.findByCodeFromCache(task_code);
+        if (ObjectUtil.isEmpty(task) && StrUtil.isNotBlank(dto.getTask_id())){
+            //从数据库查找
+            task = taskService.findById(dto.getTask_id());
+        }
         String currentUsername = SecurityUtils.getCurrentUsername();
         String now = DateUtil.now();
         if (StrUtil.isEmpty(dto.getRoute_plan_code())) {
@@ -641,15 +645,6 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         if (ObjectUtil.isNotEmpty(task.getTask_type())) {
             dto.setInstruction_type(task.getTask_type());
         }
-        DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
-        Device startdevice = appService.findDeviceByCode(dto.getStart_device_code());
-        HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
-        StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;
-
-        if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-            hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
-            hongXiangConveyorDeviceDriver.writing(3, Integer.valueOf(dto.getInstruction_code()));
-        }
 
         try {
 //            String start_device_code = dto.getStart_device_code();
diff --git a/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 27ca10e..3e2af27 100644
--- a/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -1319,6 +1319,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
             instructionservice.create2(instdto);
         } catch (Exception e) {
             log.error("手动创建指令失败！任务id为:{},指令号为:{}，失败原因{}", acsTask.getTask_id(), instdto.getInstruction_code(), e.getMessage());
+            throw new BadRequestException("手动创建指令失败,失败原因:"+e.getMessage());
         }
         return instdto;
     }