diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index 745870ba0..c9a4b4fb0 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -383,7 +383,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 
                     //存在行架->暂存的AGV任务 需要过滤
                     // 6 行架任务 8烘箱任务
-                    if(!StrUtil.equals(taskDto.getTask_type(),"6") || StrUtil.equals(taskDto.getTask_type(),"8")){
+                    if(!StrUtil.equals(taskDto.getTask_type(),"6") && !StrUtil.equals(taskDto.getTask_type(),"8")){
                         taskDto = null;
                         continue;
                     }
@@ -478,7 +478,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             taskDtoList = this.sortTask(taskDtoList);
                             task = taskDtoList.get(j);
                             // 6 行架任务 8烘箱任务
-                            if(!StrUtil.equals(task.getTask_type(),"6") || StrUtil.equals(task.getTask_type(),"8")){
+                            if(!StrUtil.equals(task.getTask_type(),"6") && !StrUtil.equals(task.getTask_type(),"8")){
                                 task = null;
                                 continue;
                             }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
index 4b31e481c..591b2e6b0 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
@@ -936,8 +936,16 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
                 + "." + param;
         Map<String, Object> itemMap = new HashMap<String, Object>();
         itemMap.put(to_param, Integer.parseInt(value));
-        this.control(itemMap);
-
+        try {
+            this.checkcontrol(itemMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            try{
+                this.checkcontrol(itemMap);
+            } catch (Exception e1){
+                e1.printStackTrace();
+            }
+        }
     }
 
     // 申请贴标
@@ -1017,6 +1025,21 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
             } else {
                 message = "申请贴标失败," + applyLabelingAndBindingResponse.getMessage();
                 logServer.deviceExecuteLog(this.device_code, "", "", "申请贴标,返回参数:" + JSON.toJSONString(applyLabelingAndBindingResponse));
+                List list = new ArrayList();
+                Map map = new HashMap();
+                map.put("code", "to_target");
+                map.put("value", "1011");
+                list.add(map);
+                Map map2 = new HashMap();
+                map2.put("code", "to_command");
+                map2.put("value", "1");
+                list.add(map2);
+                Map map3 = new HashMap();
+                map3.put("code", "to_task");
+                map3.put("value", "0");
+                list.add(map3);
+                this.writing(list);
+                requireSucess = true;
 
             }
         }
@@ -1034,7 +1057,16 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
             }
         }
         logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap);
-        this.control(itemMap);
+        try {
+            this.checkcontrol(itemMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            try{
+                this.checkcontrol(itemMap);
+            } catch (Exception e1){
+                e1.printStackTrace();
+            }
+        }
     }
 
     @Override