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

fix: 堆垛机异常情况取消

Browse Source
This commit is contained in:
LENOVO
2024-05-08 17:16:58 +08:00
parent 5d88fe734d
commit b36299dd56
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,7 +376,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
case 0:
boolean b = applyTask();
if (b) {
if (updateCommand("0")) break;
requireSucess = false;
}
break;
@@ -801,12 +800,12 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
return false;
} else {
//维修解警后重新向堆垛机下发指令
Instruction instructionErro = checkInst();
if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){
List list = new ArrayList();
pakagePLCData(list, String.valueOf(z),String.valueOf(x),String.valueOf(y),instructionErro.getExecute_code(),task);
return true;
}
// Instruction instructionErro = checkInst();
// if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){
// List list = new ArrayList();
// pakagePLCData(list, String.valueOf(z),String.valueOf(x),String.valueOf(y),instructionErro.getExecute_code(),task);
// return true;
// }
this.instruction_require_time = date;
//输入:指令类型多种\ 指令状态多种\