From d4c9e471ce556739fbcce8ac777b4fb2798df1e5 Mon Sep 17 00:00:00 2001
From: LENOVO <1793460677@qq.com>
Date: Mon, 6 May 2024 19:49:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BAddj?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/system/service/quartz/task/CreateDDJInst.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 8fe15c654..47c8aae54 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
@@ -122,7 +122,7 @@ public class CreateDDJInst {
                             standardStackerDeviceDriver = (StandardStackerDeviceDriver) deviceByCode.getDeviceDriver();
                             if (standardStackerDeviceDriver.getMode() != 3 || standardStackerDeviceDriver.getMove() == 1 || standardStackerDeviceDriver.getCommand() != 0) {
                                 log.error("堆垛机,{}未联机或者在执行中", deviceByCode.getDevice_code());
-                                ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("堆垛机,{}未联机或者在执行中" + deviceByCode.getDevice_code());
+                                ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("one_message7");
                                 return;
                             }
                         }
@@ -133,7 +133,6 @@ public class CreateDDJInst {
                                 routeLineService.getShortPathLines(
                                         taskDto.getStart_device_code(), taskDto.getNext_device_code(), taskDto.getRoute_plan_code());
                         if (ObjectUtils.isEmpty(list)) {
-                            ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("路由不通" + deviceByCode.getDevice_code());
                             throw new BadRequestException("路由不通");
                         }
                         RouteLineDto routeLineDto = list.get(0);
@@ -150,7 +149,7 @@ public class CreateDDJInst {
                             standardStackerDeviceDriver = (StandardStackerDeviceDriver) deviceByCode.getDeviceDriver();
                             if (standardStackerDeviceDriver.getMode() != 3 || standardStackerDeviceDriver.getForkCargo() == 1 || standardStackerDeviceDriver.getCommand() != 0) {
                                 log.error("堆垛机,{}未联机或者在执行中", deviceByCode.getDevice_code());
-                                ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("堆垛机,{}未联机或者在执行中" + deviceByCode.getDevice_code());
+                                ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("one_message7");
                                 return;
                             }
                         }
@@ -162,7 +161,7 @@ public class CreateDDJInst {
                             beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver();
                             if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 1) {
                                 log.error("输送机,{}未联机或执行中", next_device_code);
-                                ((BeltConveyorDeviceDriver) nextDevice.getDeviceDriver()).setNotCreateInstMessage("输送机,{}未联机或执行中" + deviceByCode.getDevice_code());
+                                ((BeltConveyorDeviceDriver) nextDevice.getDeviceDriver()).setNotCreateInstMessage("one_message7");
                                 return;
                             }
                         }