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

fix RGV驱动

Browse Source
This commit is contained in:
张江玮
2023-04-03 23:00:35 +08:00
parent b5e11636ff
commit beb2b49d50
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
View File

@@ -260,15 +260,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
instructionService.update(inst1);
}
}
if (action_1 == 0) {
if (task2 > 0) {
if (action_2 == 2) {
writing("to_command1", "1");
}
} else {
writing("to_command1", "1");
}
}
}
if (action_1 == 4 && move_1 == 0 && task1 > 0) {
//inst_message
@@ -277,7 +268,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
try {
finish_instruction(inst1);
} catch (Exception e) {
logServer.deviceExecuteLog(this.device_code, "", "", "前工位指令" + task1 + "完成失败，请手动完成。");
log.error("RGV 前工位完成指令异常", e);
logServer.deviceExecuteLog(this.device_code, "", "", "前工位指令" + task1 + "完成异常，异常原因：" + e.getMessage());
}
writing("to_command1", "0");
writing("to_onset1", "0");
@@ -298,9 +290,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
instructionService.update(inst2);
}
}
if (action_2 == 0) {
writing("to_command2", "1");
}
}
if (action_2 == 4 && move_2 == 0 && task2 > 0) {
//inst_message
@@ -309,7 +298,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
try {
finish_instruction(inst2);
} catch (Exception e) {
logServer.deviceExecuteLog(this.device_code, "", "", "后工位指令" + task2 + "完成失败，请手动完成。");
log.error("RGV 前工位完成指令异常", e);
logServer.deviceExecuteLog(this.device_code, "", "", "后工位指令" + task1 + "完成异常，异常原因：" + e.getMessage());
}
writing("to_command2", "0");
writing("to_onset2", "0");
@@ -499,7 +489,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
String start_addr = startdevice.getExtraValue().get("OPCServer").toString();
String next_addr = nextdevice.getExtraValue().get("OPCServer").toString();
// writing("to_command1", "1");
writing("to_command1", "1");
writing("to_onset1", start_addr);
writing("to_target1", next_addr);
writing("to_task1", instdto.getInstruction_code());
@@ -579,7 +569,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
String start_addr = startdevice.getExtraValue().get("OPCServer").toString();
String next_addr = nextdevice.getExtraValue().get("OPCServer").toString();
// writing("to_command2", "1");
writing("to_command2", "1");
writing("to_onset2", start_addr);
writing("to_target2", next_addr);
writing("to_task2", instdto.getInstruction_code());

2
acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -396,7 +396,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
}
logServer.deviceExecuteLog("ndc","","","phase==0x06," + "指令号：" + ikey + ",address：RYSMW01");
//检测站点
if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
if (ObjectUtil.isNotEmpty(device) && device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
if (lnshLaminatingMachineDeviceDriver.getMode() != 0 && lnshLaminatingMachineDeviceDriver.getMode() != 6) {
inst.setExecute_status("9");