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 39f9f88..4b13174 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
@@ -292,7 +292,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev
                 }
             }
             //前工位放货时判断放货位光电信号
-            if (mode == 3 && action1 == 3 && move1 == 1 && task1 > 0) {
+            if (mode == 3 && action1 == 3 && move1 == 1 && task1 > 0 && action2 != 3) {
                 Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1));
                 String next_device_code = inst1.getNext_device_code();
                 Device nextDevice = deviceAppservice.findDeviceByCode(next_device_code);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java
index 3694ffb..3b3eee7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java
@@ -5,7 +5,7 @@ package org.nl.wms.pda.scanGroup;
  */
 public enum HcwNumEnum {
     KLZHCQ(1, "KLZHCQ", 10),
-    KLZCQ(2, "KLZCQ", 26),
+    KLZCQ(2, "KLZCQ", 25),
     MLZZCQ(3, "MLZZCQ", 26),
     YLJQ(4, "YLJQ", 8),
     HNJQ(5, "HNJQ", 2),