From 30329145116cde8a023bcb54873d6eec2d64bf88 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Tue, 18 Jul 2023 17:11:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=20rgv=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lnsh/lnsh_rgv/LnshRGVDeviceDriver.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java index 9ea7c2e..d8cb42a 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java @@ -618,8 +618,9 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi } else { String start_addr = startdevice.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_onset1", start_addr); writing("to_target1", next_addr); @@ -650,7 +651,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi , instdto.getInstruction_code())) { writing("to_command2", "1"); writing("to_onset2", start_addr); - writing("to_target2", start_addr); + writing("to_target2", next_addr); writing("to_task2", instdto.getInstruction_code()); logServer.deviceExecuteLog(device_code, "", "", instdto.getInstruction_code() + "再次下发信号"); try { @@ -783,7 +784,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi String start_addr = startdevice.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_onset1", start_addr); writing("to_target1", next_addr); @@ -814,7 +816,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi , instdto.getInstruction_code())) { writing("to_command2", "1"); writing("to_onset2", start_addr); - writing("to_target2", start_addr); + writing("to_target2", next_addr); writing("to_task2", instdto.getInstruction_code()); logServer.deviceExecuteLog(device_code, "", "", instdto.getInstruction_code() + "再次下发信号"); try {