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

rev 标记复位

Browse Source
This commit is contained in:
gengby
2023-05-29 11:20:28 +08:00
parent e7af74c17d
commit 56ae491aa1
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -216,6 +216,11 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = false; requireSucess = false;
requireEmptyInSuccess = false; requireEmptyInSuccess = false;
} }
} else if (StrUtil.equals(this.device_code, "1016")) {
if (mode == 8 && last_mode == 2) {
requireSucess = false;
requireEmptyInSuccess = false;
}
} else { } else {
requireSucess = false; requireSucess = false;
requireEmptyInSuccess = false; requireEmptyInSuccess = false;
@@ -748,8 +753,8 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
map3.put("value", "1"); map3.put("value", "1");
list.add(map3); list.add(map3);
this.writing(list); this.writing(list);
while(!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer()+"."+this.getOpcPlc()+"."+this.getDevice_code()+".task").toString() while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString()
,instdto.getInstruction_code())){ , instdto.getInstruction_code())) {
this.writing(list); this.writing(list);
logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号"); logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
try { try {
@@ -790,8 +795,8 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
map3.put("value", "1"); map3.put("value", "1");
list.add(map3); list.add(map3);
this.writing(list); this.writing(list);
while(!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer()+"."+this.getOpcPlc()+"."+this.getDevice_code()+".task").toString() while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString()
,inst.getInstruction_code())){ , inst.getInstruction_code())) {
this.writing(list); this.writing(list);
logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号"); logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
try { try {