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

更新

Browse Source
This commit is contained in:
gengby
2023-01-03 21:52:14 +08:00
parent 197b6a49b8
commit 9887483aa1
5 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
View File

@@ -171,7 +171,6 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De
String message = null;
try {
device_code = this.getDeviceCode();
mode = this.itemProtocol.getMode();
move = this.itemProtocol.getMove();
action = this.itemProtocol.getAction();

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java
View File

@@ -446,6 +446,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev
String next_device_code = task.getNext_device_code();
if (repeatDeviceCodeList.contains(startDeviceCode)) {
if (!repeatPutDeviceCodeList.contains(next_device_code)) {
task = null;
continue;
} else {
if (ObjectUtil.isNotEmpty(task)) break;
@@ -552,13 +553,14 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev
String next_device_code = task.getNext_device_code();
if (repeatDeviceCodeList.contains(startDeviceCode)) {
if (!repeatPutDeviceCodeList.contains(next_device_code)) {
task = null;
continue;
} else {
if (ObjectUtil.isNotEmpty(task)) break;
}
}
}
if (ObjectUtil.isNotEmpty(task));
if (ObjectUtil.isNotEmpty(task)) ;
}
}