From 8207f529613d39364887190c5c77f50e6cd7f57d Mon Sep 17 00:00:00 2001
From: LENOVO <1793460677@qq.com>
Date: Sun, 5 May 2024 14:12:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=AB=E7=A0=81=E4=BD=8D=E6=89=98?=
 =?UTF-8?q?=E7=9B=98=E7=B1=BB=E5=9E=8B=E4=B8=8B=E5=8F=91=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConveyorWithScannerWeightDeviceDriver.java               | 4 ++--
 .../org/nl/system/service/quartz/task/CreateDDJInst.java     | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
index fbd4ba383..aea161fe8 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
@@ -563,8 +563,8 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
         map3.put("value", containerType);
         list.add(map3);
         Map map4 = new HashMap();
-        map3.put("code", "to_command");
-        map3.put("value", "1");
+        map4.put("code", "to_command");
+        map4.put("value", "1");
         list.add(map4);
 
         this.writing(list);
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 2e2714405..3a9e1acf1 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,6 +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());
                                 return;
                             }
                         }
@@ -132,6 +133,7 @@ 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);
@@ -148,6 +150,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());
                                 return;
                             }
                         }
@@ -159,6 +162,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());
                                 return;
                             }
                         }
@@ -193,6 +197,7 @@ public class CreateDDJInst {
                         List<RouteLineDto> shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code);
                         if (ObjectUtils.isEmpty(shortPathsList) || shortPathsList.size() < 1) {
                             throw new RuntimeException("路由不通!");
+
                         }
                     }