diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index f15dd5a..279d0d3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -191,7 +191,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic // 解析错误信息，提取action和mode不满足的原因 String error_action = null; String error_mode = null; - + // 根据不同设备驱动类型，提取action和mode信息 if (deviceDriver instanceof WasteFoilWeighingStationDriver) { WasteFoilWeighingStationDriver driver = (WasteFoilWeighingStationDriver) deviceDriver; @@ -201,14 +201,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if (driver.getMode() != 2) { error_mode = "模式:" + driver.getMode() + "不满足条件"; } - } else if (deviceDriver instanceof StandardOrdinarySiteDeviceDriver) { - StandardOrdinarySiteDeviceDriver driver = (StandardOrdinarySiteDeviceDriver) deviceDriver; - if (driver.getAction() != 1) { - error_action = "动作信号:" + driver.getAction() + "不满足条件"; - } - if (driver.getMode() != 2) { - error_mode = "模式:" + driver.getMode() + "不满足条件"; - } } else if (deviceDriver instanceof HongXiangStationDeviceDriver) { HongXiangStationDeviceDriver driver = (HongXiangStationDeviceDriver) deviceDriver; if (driver.getAction() != 1) { @@ -225,14 +217,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if (driver.getMode() != 2) { error_mode = "模式:" + driver.getMode() + "不满足条件"; } - } else if (deviceDriver instanceof RangingStationsDeviceDriver) { - RangingStationsDeviceDriver driver = (RangingStationsDeviceDriver) deviceDriver; - if (driver.getAction() != 1) { - error_action = "动作信号:" + driver.getAction() + "不满足条件"; - } - if (driver.getMode() != 2) { - error_mode = "模式:" + driver.getMode() + "不满足条件"; - } } else if (deviceDriver instanceof StandardInspectSiteDeviceDriver) { StandardInspectSiteDeviceDriver driver = (StandardInspectSiteDeviceDriver) deviceDriver; if (driver.getAction() != 1) { @@ -242,28 +226,28 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic error_mode = "模式:" + driver.getMode() + "不满足条件"; } } - + // 创建AGV状态对象 TwoFloorAgvStatus agvStatus = new TwoFloorAgvStatus(); - + // 设置AGV车辆代码 String vehicleCode = String.format("AGV%02d", carno); agvStatus.setVehicle_code(vehicleCode); - + // 设置错误信息 agvStatus.setIs_error(true); agvStatus.setStatus("error"); agvStatus.setError_message(message); agvStatus.setError_action(error_action); agvStatus.setError_mode(error_mode); - + // 更新到服务 agvStatusService.updateAgvStatus(agvStatus); } catch (Exception e) { log.error("记录任务卡住原因失败: {}", e.getMessage()); } } - + public synchronized void processSocket(int[] arr) throws Exception { device_code = this.getDeviceCode(); byte[] data = null; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index 2fcd310..9646f38 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -44,7 +44,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; /** * 输送线 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java index 064262d..7b13818 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java @@ -40,7 +40,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; /** * 一楼木箱机械手、子卷机械手对接位 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ActionEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ActionEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ActionEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ActionEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ContainerTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ContainerTypeEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ContainerTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ContainerTypeEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ErrorEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ErrorEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ErrorEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ErrorEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ModeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ModeEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ModeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ModeEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/MoveEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/MoveEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/MoveEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/MoveEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ToCommandEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ToCommandEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ToCommandEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ToCommandEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java index 5c70aa1..c5148a2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java @@ -40,7 +40,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; /** * 一楼出库捆轧贴标位 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java index 77d7741..28e6757 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java @@ -1,7 +1,6 @@ package org.nl.acs.device_driver.lk_conveyor.finished_product_out_with_bind_lable_conveyor; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.lk_conveyor.finished_product_out_with_bind_lable_conveyor.FinishedProductOutBindLableDeviceDriver; import java.util.ArrayList; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java index c4a4df5..30eca7a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java @@ -42,7 +42,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; /** * 拆叠盘机 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 8ad6d2c..ed1c05d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -44,7 +44,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; /** * 出入库输送线工位-带扫码称重 @@ -548,7 +547,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv param.put("weight", this.weight); } param.put("type", type); - HttpResponse httpResponse = acsToWmsService.c(param); + HttpResponse httpResponse = acsToWmsService.applyTwo(param); if (ObjectUtil.isNotEmpty(httpResponse)) { JSONObject resp = JSONObject.parseObject(httpResponse.body()); if (resp != null && resp.getIntValue("status") == 200) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/一楼扫码输送线 b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/一楼扫码输送线 similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/一楼扫码输送线 rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/一楼扫码输送线 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/二楼开盒盖 b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/二楼开盒盖 similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/二楼开盒盖 rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/二楼开盒盖 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/InteractionJsonDTO.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/InteractionJsonDTO.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/InteractionJsonDTO.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/Action2Enum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/Action2Enum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/Action2Enum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/Action2Enum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ActionEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ActionEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ActionEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ActionEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ContainerTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ContainerTypeEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ContainerTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ContainerTypeEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ErrorEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ErrorEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ErrorEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ErrorEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ModeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ModeEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ModeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ModeEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/MoveEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/MoveEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/MoveEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/MoveEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/OpenCloseManipulatorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/OpenCloseManipulatorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/OpenCloseManipulatorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/OpenCloseManipulatorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/InteractionJsonDTO.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/InteractionJsonDTO.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/InteractionJsonDTO.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/TrappedManipulatorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/TrappedManipulatorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/TrappedManipulatorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/TrappedManipulatorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java