From 88509b463c62d73bce8d8bbc130decd11e7af4b9 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Thu, 30 Nov 2023 09:41:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/device/device_driver/DriverTypeEnum.java | 6 +++--- .../basedriver/belt_conveyor/BeltConveyorDeviceDriver.java | 1 - .../acs/taskscreen/service/impl/TaskScreenServiceImpl.java | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index eccf7f2..eb1f189 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -37,9 +37,9 @@ public enum DriverTypeEnum { BELT_CONVEYOR(13,"belt_conveyor","输送线","conveyor"), - SCREEN(15, "led_screen", "LED点阵屏", "screen"), - DOUBLE_STATION_STACKER(16, "double_station_stacker", "双工位堆垛机", "double_station_stacker"), - ; + LED_SCREEN(15, "led_screen", "LED点阵屏", "screen"), + + DOUBLE_STATION_STACKER(16, "double_station_stacker", "双工位堆垛机", "double_station_stacker"); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java index 2c4def8..dec70e1 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java @@ -407,7 +407,6 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements this.writing(map); led_message = getLedMessage(inst); requireSucess = true; - led_message = getLedMessage(inst); return true; } else { //判断是否有相同起点的,任务状态就绪的任务 diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java index c84fb78..eda8d58 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java @@ -113,8 +113,7 @@ public class TaskScreenServiceImpl extends CommonServiceImpl