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:
USER-20220102CG\noblelift
2023-07-18 17:11:57 +08:00
parent 416a5b0da3
commit 3032914511
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -618,8 +618,9 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
} else { } else {
String start_addr = startdevice.getExtraValue().get("OPCServer").toString(); String start_addr = startdevice.getExtraValue().get("OPCServer").toString();
String next_addr = nextdevice.getExtraValue().get("OPCServer").toString(); String next_addr = nextdevice.getExtraValue().get("OPCServer").toString();
//如果终点是BZSLW 则用前工位 //如果起点是包装位 则用前工位
if(StrUtil.equals("BZSLW",next_device_code)){ if(StrUtil.equals("FJJXSXLW201",start_device_code) || StrUtil.equals("FJJXSXLW202",start_device_code)
|| StrUtil.equals("FJJXSXLW301",start_device_code) || StrUtil.equals("FJJXSXLW302",start_device_code) ){
writing("to_command1", "1"); writing("to_command1", "1");
writing("to_onset1", start_addr); writing("to_onset1", start_addr);
writing("to_target1", next_addr); writing("to_target1", next_addr);
@@ -650,7 +651,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
, instdto.getInstruction_code())) { , instdto.getInstruction_code())) {
writing("to_command2", "1"); writing("to_command2", "1");
writing("to_onset2", start_addr); writing("to_onset2", start_addr);
writing("to_target2", start_addr); writing("to_target2", next_addr);
writing("to_task2", instdto.getInstruction_code()); writing("to_task2", instdto.getInstruction_code());
logServer.deviceExecuteLog(device_code, "", "", instdto.getInstruction_code() + "再次下发信号"); logServer.deviceExecuteLog(device_code, "", "", instdto.getInstruction_code() + "再次下发信号");
try { try {
@@ -783,7 +784,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
String start_addr = startdevice.getExtraValue().get("OPCServer").toString(); String start_addr = startdevice.getExtraValue().get("OPCServer").toString();
String next_addr = nextdevice.getExtraValue().get("OPCServer").toString(); String next_addr = nextdevice.getExtraValue().get("OPCServer").toString();
//如果终点是BZSLW 则用前工位 //如果终点是BZSLW 则用前工位
if(StrUtil.equals("BZSLW",next_device_code)){ if(StrUtil.equals("FJJXSXLW201",start_device_code) || StrUtil.equals("FJJXSXLW202",start_device_code)
|| StrUtil.equals("FJJXSXLW301",start_device_code) || StrUtil.equals("FJJXSXLW302",start_device_code) ){
writing("to_command1", "1"); writing("to_command1", "1");
writing("to_onset1", start_addr); writing("to_onset1", start_addr);
writing("to_target1", next_addr); writing("to_target1", next_addr);
@@ -814,7 +816,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
, instdto.getInstruction_code())) { , instdto.getInstruction_code())) {
writing("to_command2", "1"); writing("to_command2", "1");
writing("to_onset2", start_addr); writing("to_onset2", start_addr);
writing("to_target2", start_addr); writing("to_target2", next_addr);
writing("to_task2", instdto.getInstruction_code()); writing("to_task2", instdto.getInstruction_code());
logServer.deviceExecuteLog(device_code, "", "", instdto.getInstruction_code() + "再次下发信号"); logServer.deviceExecuteLog(device_code, "", "", instdto.getInstruction_code() + "再次下发信号");
try { try {