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:
yanps
2025-02-22 16:02:52 +08:00
parent 069c5fc63b
commit 37516c6d0f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -1589,7 +1589,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
} }
//双任务 后工位反馈任务完成 并反馈 //双任务 后工位反馈任务完成 并反馈
if (mode == 3 && action1 == 4 && move2 == 0 && task1 > 0 && task2 > 0 && type == 3) { if (mode == 3 && action1 == 4 && move1 == 0 && task1 > 0 && task2 > 0 && type == 3) {
if (to_command1 != 5) { if (to_command1 != 5) {
this.writing("to_command1", "5"); this.writing("to_command1", "5");
} }
@@ -1601,10 +1601,10 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
feedMessage += "行架工作模式不为运行中(mode != 3),"; feedMessage += "行架工作模式不为运行中(mode != 3),";
} }
if (action2 != 4) { if (action2 != 4) {
feedMessage += "后工位动作信号未放货完成(action2 != 4),"; feedMessage += "后工位动作信号未放货完成(action1 != 4),";
} }
if (move2 != 0) { if (move2 != 0) {
feedMessage += "后工位光电信号不应该为有货状态(move2 != 0),"; feedMessage += "后工位光电信号不应该为有货状态(move1 != 0),";
} }
if (task1 == 0) { if (task1 == 0) {
feedMessage += "前工位没有任务号(task1 == 0),"; feedMessage += "前工位没有任务号(task1 == 0),";
@@ -1724,9 +1724,9 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
//双工位 任务完成 前工位反馈4 //双工位 任务完成 前工位反馈4
if (mode == 3 && action2 == 4 && move1 == 0 && task1 > 0 && task2 > 0 && type == 3) { if (mode == 3 && action2 == 4 && move2 == 0 && task1 > 0 && task2 > 0 && type == 3) {
//inst_message //inst_message
Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1)); Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task2));
if (inst1 != null) { if (inst1 != null) {
if (StrUtil.equals(inst1.getInstruction_status(), "1")) { if (StrUtil.equals(inst1.getInstruction_status(), "1")) {
if (to_command2 != 5) { if (to_command2 != 5) {
@@ -1744,10 +1744,10 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
feedMessage += "行架工作模式不为运行中(mode != 3),"; feedMessage += "行架工作模式不为运行中(mode != 3),";
} }
if (action1 != 4) { if (action1 != 4) {
feedMessage += "前工位动作信号未放货完成(action1 != 4),"; feedMessage += "前工位动作信号未放货完成(action2 != 4),";
} }
if (move1 != 0) { if (move1 != 0) {
feedMessage += "前工位光电信号为不应为有货状态(move1 != 0),"; feedMessage += "前工位光电信号为不应为有货状态(move2 != 0),";
} }
if (task1 == 0) { if (task1 == 0) {
feedMessage += "前工位没有任务(task1 == 0),"; feedMessage += "前工位没有任务(task1 == 0),";