rev 更新目录结构

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java

@@ -13,9 +13,9 @@ import org.nl.acs.agv.AgvUtil;
 import org.nl.acs.agv.server.MagicAgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
+import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java

@@ -12,7 +12,7 @@ import org.nl.acs.agv.AgvUtil;
 import org.nl.acs.agv.server.ZheDaAgvService;
 import org.nl.acs.device.domain.Device;
 
-import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.hongxiang_device.HongXiangConveyorDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@@ -6,7 +6,7 @@ import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.NDCAgvService;
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.service.DeviceService;
-import org.nl.acs.device_driver.basedriver.agv.ndcone.AgvNdcOneDeviceDriver;
+import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.instruction.domain.Instruction;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithPlcScannerDevice.java

@@ -3,7 +3,7 @@ package org.nl.acs.common;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver;
 import org.springframework.stereotype.Service;
 
 /**

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithScannerDevice.java

@@ -3,7 +3,7 @@ package org.nl.acs.common;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
 import org.springframework.stereotype.Service;
 
 /**

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardInspectSiteDevice.java

@@ -2,7 +2,7 @@ package org.nl.acs.common;
 
 import com.alibaba.fastjson.JSONObject;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.springframework.stereotype.Service;
 
 /**

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardOrdinarySiteDevice.java

@@ -2,7 +2,7 @@ package org.nl.acs.common;
 
 import com.alibaba.fastjson.JSONObject;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.springframework.stereotype.Service;
 
 /**

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@@ -1,6 +1,5 @@
 package org.nl.acs.device.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -41,15 +40,15 @@ import org.nl.acs.device.service.DeviceDriverDefinationAppService;
 import org.nl.acs.device.service.DeviceExtraService;
 import org.nl.acs.device_driver.DeviceDriverDefination;
 import org.nl.acs.device_driver.ScannerDeviceDriver;
-import org.nl.acs.device_driver.basedriver.oven_manipulator.OvenGantryManipulatorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.oven_manipulator.OvenGantryManipulatorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor_ckk.SiemensConveyorCkkDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk.SiemensConveyorCkkDeviceDriver;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor_labeling.SiemensConveyorLabelingDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling.SiemensConveyorLabelingDeviceDriver;
-import org.nl.acs.device_driver.basedriver.slit_two_manipulator.SlitTwoManipulatorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.slit_two_manipulator.SlitTwoManipulatorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_scanner.StandardScannerDeviceDriver;
+import org.nl.acs.device_driver.scanner.standard_scanner.StandardScannerDeviceDriver;
 import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
 import org.nl.acs.device.service.dto.DeviceRunpointDto;
 import org.nl.acs.opc.DeviceAppService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.magic_agv;
+package org.nl.acs.device_driver.agv.magic_agv;
 
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.enums.DeviceType;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.magic_agv;
+package org.nl.acs.device_driver.agv.magic_agv;
 
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.ndcone;
+package org.nl.acs.device_driver.agv.ndcone;
 
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.enums.DeviceType;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java

@@ -1,6 +1,5 @@
-package org.nl.acs.device_driver.basedriver.agv.ndcone;
+package org.nl.acs.device_driver.agv.ndcone;
 
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -13,28 +12,21 @@ import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.FeedLmsRealFailed;
-import org.nl.acs.device_driver.basedriver.agv.utils.OneAgvPhase;
+import org.nl.acs.device_driver.agv.utils.OneAgvPhase;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
+import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractDeviceDriver;
-import org.nl.acs.ext.wms.data.one.BaseRequest;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.impl.InstructionServiceImpl;
-import org.nl.acs.log.LokiLog;
-import org.nl.acs.log.LokiLogType;
 import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.opc.DeviceAppService;
-import org.nl.acs.task.service.TaskService;
-import org.nl.acs.task.service.dto.TaskDto;
-import org.nl.acs.task.service.impl.TaskServiceImpl;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;
-import org.nl.system.service.param.impl.SysParamServiceImpl;
 
 import java.util.ArrayList;
 import java.util.HashMap;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.ndctwo;
+package org.nl.acs.device_driver.agv.ndctwo;
 
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.enums.DeviceType;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.ndctwo;
+package org.nl.acs.device_driver.agv.ndctwo;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,8 +9,8 @@ import org.nl.acs.agv.server.NDCAgvService;
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
+import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.utils;
+package org.nl.acs.device_driver.agv.utils;
 
 public interface IAgv {
     String getPhaseName(Integer phase);

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.utils;
+package org.nl.acs.device_driver.agv.utils;
 
 import org.springframework.stereotype.Service;
 

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.utils;
+package org.nl.acs.device_driver.agv.utils;
 
 import org.springframework.stereotype.Service;
 

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.xg_agv;
+package org.nl.acs.device_driver.agv.xg_agv;
 
 import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.xg_agv;
+package org.nl.acs.device_driver.agv.xg_agv;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.agv.xg_agv;
+package org.nl.acs.device_driver.agv.xg_agv;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -13,11 +13,10 @@ import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.enums.InstructionStatusEnum;
 import org.nl.acs.utils.ReadUtil;
 import org.nl.acs.device_driver.DeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
-import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.opc.DeviceAppService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_autodoor;
+package org.nl.acs.device_driver.autodoor.standard_autodoor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_autodoor;
+package org.nl.acs.device_driver.autodoor.standard_autodoor;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_autodoor;
+package org.nl.acs.device_driver.autodoor.standard_autodoor;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.belt_conveyor;
+package org.nl.acs.device_driver.conveyor.belt_conveyor;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.belt_conveyor;
+package org.nl.acs.device_driver.conveyor.belt_conveyor;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -26,7 +25,6 @@ import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.route.service.dto.RouteLineDto;
-import org.nl.acs.task.domain.Task;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.config.SpringContextHolder;
@@ -300,7 +298,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
 
     public void writing(int command) {
         String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command;
+                + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command;
 
         Map<String, Object> itemMap = new HashMap<String, Object>();
         this.control(itemMap);

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.belt_conveyor;
+package org.nl.acs.device_driver.conveyor.belt_conveyor;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/Paper.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.belt_conveyor;
+package org.nl.acs.device_driver.conveyor.belt_conveyor;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.box_palletizing_manipulator;
+package org.nl.acs.device_driver.conveyor.box_palletizing_manipulator;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.box_palletizing_manipulator;
+package org.nl.acs.device_driver.conveyor.box_palletizing_manipulator;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.box_palletizing_manipulator;
+package org.nl.acs.device_driver.conveyor.box_palletizing_manipulator;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.double_station_stacker;
+package org.nl.acs.device_driver.conveyor.double_station_stacker;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.double_station_stacker;
+package org.nl.acs.device_driver.conveyor.double_station_stacker;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -20,10 +20,10 @@ import org.nl.acs.device.service.DeviceExtraService;
 import org.nl.acs.device.service.impl.DeviceExtraServiceImpl;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
-import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.double_station_stacker.enums.CommandEnum;
+import org.nl.acs.device_driver.conveyor.double_station_stacker.enums.CommandEnum;
-import org.nl.acs.device_driver.basedriver.double_station_stacker.enums.SortEnum;
+import org.nl.acs.device_driver.conveyor.double_station_stacker.enums.SortEnum;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.instruction.domain.Instruction;
@@ -578,7 +578,7 @@ public class DoubleStationStackerDeviceDriver extends AbstractOpcDeviceDriver im
             //根据排序进行加减
             String nextPointCodeDown = splitFront[0] + "-" + (Integer.parseInt(splitFront[1]) - 1) + "-" + splitFront[2];
             String nextPointCodeUp = splitFront[0] + "-" + (Integer.parseInt(splitFront[1]) + 1) + "-" + splitFront[2];
-            if (CollectionUtil.isNotEmpty(sort)&&SortEnum.BACK.getCode().equals(sort.get(0).getExtra_value())){
+            if (CollectionUtil.isNotEmpty(sort)&& SortEnum.BACK.getCode().equals(sort.get(0).getExtra_value())){
                 nextPointCodeDown = splitFront[0] + "-" + (Integer.parseInt(splitFront[1]) + 1) + "-" + splitFront[2];
                 nextPointCodeUp = splitFront[0] + "-" + (Integer.parseInt(splitFront[1]) - 1) + "-" + splitFront[2];
             }

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.double_station_stacker;
+package org.nl.acs.device_driver.conveyor.double_station_stacker;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/CommandEnum.java

@@ -2,11 +2,10 @@
  * @author ls
  * @date 2023/12/4 13:42
  */
-package org.nl.acs.device_driver.basedriver.double_station_stacker.enums;
+package org.nl.acs.device_driver.conveyor.double_station_stacker.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.nl.acs.task.enums.TaskStatusEnum;
 
 @Getter
 @AllArgsConstructor

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/SortEnum.java

@@ -2,7 +2,7 @@
  * @author ls
  * @date 2023/12/4 17:43
  */
-package org.nl.acs.device_driver.basedriver.double_station_stacker.enums;
+package org.nl.acs.device_driver.conveyor.double_station_stacker.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/HongXiangStationDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.hongxiang_conveyor;
+package org.nl.acs.device_driver.conveyor.hongxiang_conveyor;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/HongXiangStationDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.hongxiang_conveyor;
+package org.nl.acs.device_driver.conveyor.hongxiang_conveyor;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.hongxiang_conveyor;
+package org.nl.acs.device_driver.conveyor.hongxiang_conveyor;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/HongXiangConveyorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.hongxiang_device;
+package org.nl.acs.device_driver.conveyor.hongxiang_device;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.hongxiang_device;
+package org.nl.acs.device_driver.conveyor.hongxiang_device;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.hongxiang_device;
+package org.nl.acs.device_driver.conveyor.hongxiang_device;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.lnsh_station;
+package org.nl.acs.device_driver.conveyor.lnsh_station;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Getter;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.lnsh_station;
+package org.nl.acs.device_driver.conveyor.lnsh_station;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDeviceDriver.java

@@ -1,14 +1,12 @@
-package org.nl.acs.device_driver.basedriver.lnsh_station;
+package org.nl.acs.device_driver.conveyor.lnsh_station;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.jinterop.dcom.common.JIException;
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
@@ -18,9 +16,6 @@ import org.nl.acs.device_driver.StandardRequestMethod;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.data.AcsToWmsData.applySignalStaus.ApplySignalStatusRequest;
-import org.nl.acs.ext.wms.data.AcsToWmsData.applySignalStaus.ApplySignalStatusResponse;
-import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest;
-import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskResponse;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
@@ -31,9 +26,6 @@ import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.task.service.TaskService;
 import org.nl.config.SpringContextHolder;
 import org.nl.system.service.lucene.LuceneExecuteLogService;
-import org.nl.system.service.lucene.dto.LuceneLogDto;
-import org.openscada.opc.lib.da.AddFailedException;
-import org.openscada.opc.lib.da.Server;
 
 import java.lang.reflect.Method;
 import java.util.*;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.oven_manipulator;
+package org.nl.acs.device_driver.conveyor.oven_manipulator;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.oven_manipulator;
+package org.nl.acs.device_driver.conveyor.oven_manipulator;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.oven_manipulator;
+package org.nl.acs.device_driver.conveyor.oven_manipulator;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -8,12 +8,11 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Lang;
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
-import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.hongxiang_device.HongXiangConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/Test.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.oven_manipulator;
+package org.nl.acs.device_driver.conveyor.oven_manipulator;
 
 import java.text.DecimalFormat;
 

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.plug_pull_device_site;
+package org.nl.acs.device_driver.conveyor.plug_pull_device_site;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/PlugPullDeviceSiteDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.plug_pull_device_site;
+package org.nl.acs.device_driver.conveyor.plug_pull_device_site;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.plug_pull_device_site;
+package org.nl.acs.device_driver.conveyor.plug_pull_device_site;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -406,33 +406,10 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
     }
 
 
-    public void writing(String param, String value) {
-
-        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + param;
-        //String opcservcerid = this.getDevice().getOpc_server_id();
-//Server server = ReadUtil.getServer(opcservcerid);
-        Map<String, Object> itemMap = new HashMap<String, Object>();
-
-        itemMap.put(to_param, Integer.parseInt(value));
-//            itemMap.put(to_param, Integer.parseInt(value));
-        this.control(itemMap);
-        logServer.deviceExecuteLog(device_code, "", "", "下发电气信号设备号:" + device_code + ",下发电气:" + to_param + ",下发电气值:" + value);
-    }
-
     public void executing(Server server, Map<String, Object> itemMap) {
         this.control(itemMap);
     }
 
-    public void writing(int command) {
-
-        //String opcservcerid = this.getDevice().getOpc_server_id();
-//Server server = ReadUtil.getServer(opcservcerid);
-        Map<String, Object> itemMap = new HashMap<String, Object>();
-        this.control(itemMap);
-
-    }
-
     @Override
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
@@ -513,8 +490,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
 
     public void writing(List list) {
 
-//        String opcservcerid = this.getDevice().getOpc_server_id();
-//        Server server = ReadUtil.getServer(opcservcerid);
         Map<String, Object> itemMap = new HashMap<String, Object>();
         for (int i = 0; i < list.size(); i++) {
             Object ob = list.get(i);
@@ -526,7 +501,16 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
             }
         }
         logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap);
-        this.control(itemMap);
+        try {
+            this.checkcontrol(itemMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            try{
+                this.checkcontrol(itemMap);
+            } catch (Exception e1){
+                e1.printStackTrace();
+            }
+        }
 
     }
 
@@ -575,11 +559,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                     map3.put("value", "1");
                     list.add(map3);
                     this.writing(list);
-//                    if (task != Integer.parseInt(inst.getInstruction_code())) {
-//                        this.writing(list);
-//                        message = "重新下发电气信号";
-//                        logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
-//                    }
                     message = "下发电气任务号成功";
                     requireSucess = true;
                     return true;
@@ -682,11 +661,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 map3.put("value", "1");
                 list.add(map3);
                 this.writing(list);
-//                if (task != Integer.parseInt(inst.getInstruction_code())) {
-//                    this.writing(list);
-//                    message = "重新下发电气信号";
-//                    logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
-//                }
             } else {
                 //如果不存在则直接找对应指令
                 Instruction inst = instructionService.findByDeviceCodeFromCache(this.device_code);
@@ -714,10 +688,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 map3.put("value", "1");
                 list.add(map3);
                 this.writing(list);
-                if (task != Integer.parseInt(inst.getInstruction_code())) {
-                    this.writing(list);
-                    logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
-                }
             }
             return true;
         }
@@ -853,8 +823,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                     map5.put("value", "4");
                     list.add(map5);
                     this.writing(list);
-//                    this.writing(list);
-
                     message = "申请捆扎成功";
                     requireSucess = true;
                 } else {

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor_ckk;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor_ckk;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor_ckk;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor_labeling;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor_labeling;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.siemens_conveyor_labeling;
+package org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.slit_two_manipulator;
+package org.nl.acs.device_driver.conveyor.slit_two_manipulator;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.slit_two_manipulator;
+package org.nl.acs.device_driver.conveyor.slit_two_manipulator;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.slit_two_manipulator;
+package org.nl.acs.device_driver.conveyor.slit_two_manipulator;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -13,7 +13,7 @@ import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -352,11 +352,11 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver
     public void writing(int command, int target, int task) {
 
         String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command;
+                + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command;
         String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.ItemProtocol.item_to_target;
+                + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_target;
         String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.ItemProtocol.item_to_task;
+                + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_task;
         //String opcservcerid = this.getDevice().getOpc_server_id();
 //Server server = ReadUtil.getServer(opcservcerid);
         Map<String, Object> itemMap = new HashMap<String, Object>();

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner;
 
 public class StandardConveyorWithPlcScannerConfig {
     public static String relation_scanner = "link_scanner";

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner;
 
 public class StandardConveyorWithScannerConfig {
     public static String relation_scanner = "link_scanner";

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner;
+package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_inspect_site;
+package org.nl.acs.device_driver.conveyor.standard_inspect_site;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_inspect_site;
+package org.nl.acs.device_driver.conveyor.standard_inspect_site;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_inspect_site;
+package org.nl.acs.device_driver.conveyor.standard_inspect_site;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -10,11 +10,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
-import org.nl.acs.device_driver.RequestMethodEnum;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
-import org.nl.acs.ext.wms.data.one.feedBackTaskStatus.FeedBackTaskStatusRequest;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_ordinary_site;
+package org.nl.acs.device_driver.conveyor.standard_ordinary_site;
 
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device_driver.DeviceDriver;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_ordinary_site;
+package org.nl.acs.device_driver.conveyor.standard_ordinary_site;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.led_screen;
+package org.nl.acs.device_driver.led.led_screen;
 
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.enums.DeviceType;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.led_screen;
+package org.nl.acs.device_driver.led.led_screen;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_scanner;
+package org.nl.acs.device_driver.scanner.standard_scanner;
 
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device_driver.DeviceDriver;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_scanner;
+package org.nl.acs.device_driver.scanner.standard_scanner;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_stacker;
+package org.nl.acs.device_driver.stacker.standard_stacker;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_stacker;
+package org.nl.acs.device_driver.stacker.standard_stacker;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -1,22 +1,20 @@
-package org.nl.acs.device_driver.basedriver.standard_stacker;
+package org.nl.acs.device_driver.stacker.standard_stacker;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device.domain.DeviceExtra;
 import org.nl.acs.device.enums.DeviceType;
 import org.nl.acs.device.service.DeviceExtraService;
 import org.nl.acs.device.service.impl.DeviceExtraServiceImpl;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
-import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.instruction.domain.Instruction;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_storage;
+package org.nl.acs.device_driver.storage.standard_storage;
 
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device_driver.DeviceDriver;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.standard_storage;
+package org.nl.acs.device_driver.storage.standard_storage;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.lamp_three_color;
+package org.nl.acs.device_driver.three_color.lamp_three_color;
 
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/LampThreecolorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.lamp_three_color;
+package org.nl.acs.device_driver.three_color.lamp_three_color;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/LampThreecolorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.basedriver.lamp_three_color;
+package org.nl.acs.device_driver.three_color.lamp_three_color;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java

@@ -7,9 +7,8 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.address.service.AddressService;
-import org.nl.acs.address.service.AddressService;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
 import org.nl.acs.ext.wms.RespUtil;
 import org.nl.acs.ext.wms.liKuData.*;
 import org.nl.acs.ext.wms.service.AcsToLiKuService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -26,15 +26,14 @@ import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.impl.DeviceServiceImpl;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.DeviceDriverDefination;
-import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.hongxiang_device.HongXiangConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.ext.wms.liKuData.*;
 import org.nl.acs.ext.wms.service.AcsToLiKuService;
 import org.nl.acs.instruction.domain.InstructionMybatis;
 import org.nl.acs.instruction.enums.InstructionStatusEnum;
-import org.nl.acs.instruction.service.SortUtlEx;
 import org.nl.acs.instruction.service.dto.InstructionDto;
 import org.nl.acs.instruction.service.dto.InstructionQueryParam;
 import org.nl.acs.opc.DeviceAppService;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java

@@ -1,56 +1,33 @@
 package org.nl.acs.taskscreen.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.auto.initial.ApplicationAutoInitial;
-import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.impl.CommonServiceImpl;
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.domain.DeviceExtra;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.dto.DeviceDto;
-import org.nl.acs.device.service.dto.DeviceExtraDto;
-import org.nl.acs.device.service.dto.DeviceQueryParam;
 import org.nl.acs.device.service.mapper.DeviceExtraMapper;
 import org.nl.acs.device.service.mapper.DeviceMapper;
-import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.led_screen.LedScreenDeviceDriver;
-import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
-import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.opc.DeviceAppService;
-import org.nl.acs.opc.DeviceAppServiceImpl;
-import org.nl.acs.storage_cell.service.dto.StorageCellDto;
 import org.nl.acs.taskscreen.mapper.TaskScreenMapper;
 import org.nl.acs.taskscreen.service.TaskScreenService;
-import org.nl.acs.utils.ConvertUtil;
 import org.nl.common.exception.BadRequestException;
-import org.nl.config.SpringContextHolder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * @author tuqiang

acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java

@@ -1,19 +1,10 @@
 package org.nl.system.service.quartz.task;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
-import org.nl.acs.device.domain.Device;
-import org.nl.acs.device.domain.DeviceExtra;
-import org.nl.acs.device.enums.DeviceType;
-import org.nl.acs.device.service.DeviceExtraService;
-import org.nl.acs.device.service.impl.DeviceExtraServiceImpl;
-import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_stacker.StandardStackerDeviceDriver;
 import org.nl.acs.instruction.enums.InstructionStatusEnum;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.domain.Instruction;
@@ -21,17 +12,13 @@ import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.opc.DeviceAppServiceImpl;
 import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.route.service.dto.RouteLineDto;
-import org.nl.acs.task.domain.Task;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
-import org.nl.common.exception.BadRequestException;
 import org.nl.config.SpringContextHolder;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**

acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java

@@ -4,16 +4,14 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device.domain.DeviceExtra;
 import org.nl.acs.device.enums.DeviceType;
 import org.nl.acs.device.service.DeviceExtraService;
 import org.nl.acs.device.service.impl.DeviceExtraServiceImpl;
-import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver;
+import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_stacker.StandardStackerDeviceDriver;
+import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.enums.InstructionStatusEnum;
 import org.nl.acs.instruction.service.InstructionService;