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:
LENOVO
2024-05-07 14:20:30 +08:00
parent c74e5fe313
commit 9ff24e0095
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -489,7 +489,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
break;
case 6:
message = "one_message2";
if (updateCommand("6")) break;
Map<String, Object> map1 = new HashMap<>();
map1.put("code", "to_command");
map1.put("value", 6);
@@ -498,7 +497,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
break;
case 7:
message = "one_message3";
if (updateCommand("7")) break;
Map<String, Object> map2 = new HashMap<>();
map2.put("code", "to_command");
map2.put("value", 7);
@@ -507,7 +505,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
break;
case 8:
message = "one_message4";
if (updateCommand("8")) break;
Map<String, Object> map3 = new HashMap<>();
map3.put("code", "to_command");
map3.put("value", 8);
@@ -805,7 +802,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
} else {
//维修解警后重新向堆垛机下发指令
Instruction instructionErro = checkInst();
if (InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){
if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){
List list = new ArrayList();
pakagePLCData(list, String.valueOf(x),String.valueOf(y),String.valueOf(z),instructionErro.getExecute_code(),task);
return true;