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

fix: 空指针异常

Browse Source
This commit is contained in:
lishuai
2024-07-25 18:52:43 +08:00
parent 7ab645a22d
commit cfd1bdba5d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,11 +558,11 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
//入库异常口为起点的任务 //入库异常口为起点的任务
TaskDto taskdto = taskserver.findByStartCodeAndReady(device_code); TaskDto taskdto = taskserver.findByStartCodeAndReady(device_code);
//移除行架任务
if (taskdto.getTask_type().equals(TaskTypeEnum.Truss_Task.getIndex())){
return false;
}
if (ObjectUtil.isNotNull(taskdto)) { if (ObjectUtil.isNotNull(taskdto)) {
//移除行架任务
if (taskdto.getTask_type().equals(TaskTypeEnum.Truss_Task.getIndex())){
return false;
}
//判断指令的起点和当前的设备号相同 //判断指令的起点和当前的设备号相同
if (!taskdto.getStart_device_code().equals(device_code)) { if (!taskdto.getStart_device_code().equals(device_code)) {
return false; return false;

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

@@ -273,14 +273,14 @@ public class ItemProtocol {
setIsonline(true); setIsonline(true);
return value; return value;
} }
return value; return 0;
} }
public String getOpcStringValue(String protocol) { public String getOpcStringValue(String protocol) {
String value = this.driver.getStringValue(protocol); String value = this.driver.getStringValue(protocol);
if (value == null) { if (value == null) {
setIsonline(false); setIsonline(false);
return value; return "";
} else { } else {
setIsonline(true); setIsonline(true);
return value; return value;