root/lanzhouhailiang_two
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:优化

Browse Source
This commit is contained in:
tuqiang
2023-11-30 09:41:50 +08:00
parent 137544f067
commit 88509b463c
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
View File

@@ -37,9 +37,9 @@ public enum DriverTypeEnum {
BELT_CONVEYOR(13,"belt_conveyor","输送线","conveyor"), BELT_CONVEYOR(13,"belt_conveyor","输送线","conveyor"),
SCREEN(15, "led_screen", "LED点阵屏", "screen"), LED_SCREEN(15, "led_screen", "LED点阵屏", "screen"),
DOUBLE_STATION_STACKER(16, "double_station_stacker", "双工位堆垛机", "double_station_stacker"),
; DOUBLE_STATION_STACKER(16, "double_station_stacker", "双工位堆垛机", "double_station_stacker");

1
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java
View File

@@ -407,7 +407,6 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
this.writing(map); this.writing(map);
led_message = getLedMessage(inst); led_message = getLedMessage(inst);
requireSucess = true; requireSucess = true;
led_message = getLedMessage(inst);
return true; return true;
} else { } else {
//判断是否有相同起点的,任务状态就绪的任务 //判断是否有相同起点的,任务状态就绪的任务

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

@@ -113,8 +113,7 @@ public class TaskScreenServiceImpl extends CommonServiceImpl<TaskScreenMapper, D
BeltConveyorDeviceDriver beltConveyorDeviceDriver; BeltConveyorDeviceDriver beltConveyorDeviceDriver;
beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver(); beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver();
if (ObjectUtil.isNotEmpty(beltConveyorDeviceDriver.getLed_message())) { if (ObjectUtil.isNotEmpty(beltConveyorDeviceDriver.getLed_message())) {
Instruction inst = beltConveyorDeviceDriver.getInst(); json = beltConveyorDeviceDriver.getLed_message();
json = beltConveyorDeviceDriver.getLedMessage(inst);
} }
} }
return json; return json;