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

GX

Browse Source
This commit is contained in:
gengby
2022-12-09 14:16:46 +08:00
parent 2653259bf3
commit 79d0312d71
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -124,7 +124,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
error = this.itemProtocol.getError(); error = this.itemProtocol.getError();
task = this.itemProtocol.getTask(); task = this.itemProtocol.getTask();
if (mode != last_mode) { if (mode != last_mode) {
if (mode == 2) { if (mode == 1) {
this.setRequireSucess(false); this.setRequireSucess(false);
} }
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); 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)); Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task));
if (ObjectUtil.isNotEmpty(inst2)) { if (ObjectUtil.isNotEmpty(inst2)) {
String start_device_code = inst2.getStart_device_code(); String start_device_code = inst2.getStart_device_code();
@@ -199,12 +199,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
} }
} else { } else {
if (this.getNow_steps_type() == 2) { 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)); Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task));
if (ObjectUtil.isNotEmpty(inst2)) { if (ObjectUtil.isNotEmpty(inst2)) {
String start_device_code = inst2.getStart_device_code(); String start_device_code = inst2.getStart_device_code();
@@ -219,12 +219,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
} }
} else { } else {
if (this.getNow_steps_type() == 3) { 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)); Instruction instructionDto = instructionService.findByCode(String.valueOf(task));
String next_device_code = instructionDto.getNext_device_code(); String next_device_code = instructionDto.getNext_device_code();
Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); Device nextDevice = deviceAppService.findDeviceByCode(next_device_code);
@@ -244,12 +244,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
} }
} else { } else {
if (this.getNow_steps_type() == 4) { 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)); Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task));
if (inst2 != null) { if (inst2 != null) {
if (StrUtil.equals(inst2.getInstruction_status(), "1")) { if (StrUtil.equals(inst2.getInstruction_status(), "1")) {
@@ -293,7 +293,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
} }
} else { } else {
if (this.getNow_steps_type() == 5) { 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; List toInstructions;
//行架机械手申请任务 //行架机械手申请任务
if (mode == 2 && move == 0 && task == 0 && !requireSucess) { if (mode == 1 && move == 0 && task == 0 && !requireSucess) {
applyTask(); applyTask();
} else { } else {
if (!requireSucess) { if (!requireSucess) {

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

@@ -453,7 +453,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
this.writing("to_command1", "2"); this.writing("to_command1", "2");
if (type == 1) { if (type == 1) {
this.setNow_steps_type1(3); this.setNow_steps_type1(3);
} else if (type == 2) { } else if (type == 3) {
this.setNow_steps_type3(4); this.setNow_steps_type3(4);
} }
} else { } else {
@@ -476,7 +476,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
this.writing("to_command1", "3"); this.writing("to_command1", "3");
if (type == 1) { if (type == 1) {
this.setNow_steps_type1(4); this.setNow_steps_type1(4);
} else if (type == 2) { } else if (type == 3) {
this.setNow_steps_type3(7); this.setNow_steps_type3(7);
} }
} else { } else {
@@ -731,6 +731,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
flag = this.executeReadyBusiness(taskDto, getDeviceCodeList, backGetDeviceCodeList); flag = this.executeReadyBusiness(taskDto, getDeviceCodeList, backGetDeviceCodeList);
if (flag) { if (flag) {
notCreateInstMessage = ""; notCreateInstMessage = "";
notCreateTaskMessage = "";
} }
} else { } else {
notCreateTaskMessage = ""; notCreateTaskMessage = "";