diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java index 1035b4d..a1ce302 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java @@ -263,7 +263,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev } //前工位取货时判断取货位光电信号 - if (mode == 3 && action1 == 1 && move1 == 0 && task1 > 0) { + if (mode == 3 && action1 == 1 && move1 == 0 && task1 > 0 && action2 != 1) { Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1)); String start_device_code = inst1.getStart_device_code(); Device startDevice = deviceAppservice.findDeviceByCode(start_device_code);