From 79d0312d71d57ec1c0f2e426eb94e11d8bbf910d Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 9 Dec 2022 14:16:46 +0800 Subject: [PATCH] GX --- .../OvenGantryManipulatorDeviceDriver.java | 20 +++++++++---------- .../SlitTwoManipulatorDeviceDriver.java | 5 +++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 3e4a2a631..fb3c5c077 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -124,7 +124,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i error = this.itemProtocol.getError(); task = this.itemProtocol.getTask(); if (mode != last_mode) { - if (mode == 2) { + if (mode == 1) { this.setRequireSucess(false); } logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); @@ -175,7 +175,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } //申请取货 - if (mode == 3 && action == 1 && move == 0 && task > 0) { + if (mode == 1 && action == 1 && move == 0 && task > 0) { Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task)); if (ObjectUtil.isNotEmpty(inst2)) { String start_device_code = inst2.getStart_device_code(); @@ -199,12 +199,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } else { if (this.getNow_steps_type() == 2) { - feedMessage = "请检查：mode == 3 && action == 1 && move == 0 && task > 0"; + feedMessage = "请检查：mode == 1 && action == 1 && move == 0 && task > 0"; } } //取货完成关闭烘箱门 - if (mode == 3 && action == 2 && move == 1 && task > 0) { + if (mode == 1 && action == 2 && move == 1 && task > 0) { Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task)); if (ObjectUtil.isNotEmpty(inst2)) { String start_device_code = inst2.getStart_device_code(); @@ -219,12 +219,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } else { if (this.getNow_steps_type() == 3) { - feedMessage = "请检查：mode == 3 && action == 2 && move == 1 && task > 0"; + feedMessage = "请检查：mode == 1 && action == 2 && move == 1 && task > 0"; } } //申请放货 - if (mode == 3 && action == 3 && move == 1 && task > 0) { + if (mode == 1 && action == 3 && move == 1 && task > 0) { Instruction instructionDto = instructionService.findByCode(String.valueOf(task)); String next_device_code = instructionDto.getNext_device_code(); Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); @@ -244,12 +244,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } else { if (this.getNow_steps_type() == 4) { - feedMessage = "请检查：mode == 3 && action == 3 && move == 1 && task > 0"; + feedMessage = "请检查：mode == 1 && action == 3 && move == 1 && task > 0"; } } //放货完成 - if (mode == 3 && action == 4 && move == 0 && task > 0) { + if (mode == 1 && action == 4 && move == 0 && task > 0) { Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task)); if (inst2 != null) { if (StrUtil.equals(inst2.getInstruction_status(), "1")) { @@ -293,7 +293,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } else { if (this.getNow_steps_type() == 5) { - feedMessage = "请检查：mode == 3 && action == 4 && move == 0 && task > 0"; + feedMessage = "请检查：mode == 1 && action == 4 && move == 0 && task > 0"; } } @@ -324,7 +324,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i List toInstructions; //行架机械手申请任务 - if (mode == 2 && move == 0 && task == 0 && !requireSucess) { + if (mode == 1 && move == 0 && task == 0 && !requireSucess) { applyTask(); } else { if (!requireSucess) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index d6c8b0bea..a14c6e74a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -453,7 +453,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl this.writing("to_command1", "2"); if (type == 1) { this.setNow_steps_type1(3); - } else if (type == 2) { + } else if (type == 3) { this.setNow_steps_type3(4); } } else { @@ -476,7 +476,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl this.writing("to_command1", "3"); if (type == 1) { this.setNow_steps_type1(4); - } else if (type == 2) { + } else if (type == 3) { this.setNow_steps_type3(7); } } else { @@ -731,6 +731,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl flag = this.executeReadyBusiness(taskDto, getDeviceCodeList, backGetDeviceCodeList); if (flag) { notCreateInstMessage = ""; + notCreateTaskMessage = ""; } } else { notCreateTaskMessage = "";