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 14ff874fb..084993529 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
@@ -215,7 +215,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                                 if (action != 1) {
                                     feedMessage = feedMessage + "允许取放(action)信号未允许取放,";
                                 }
-                                if (move != 1){
+                                if (move != 1) {
                                     feedMessage = feedMessage + "取货位光电信号（move）不应该为无货状态,";
                                 }
                                 if (error1 != 0) {
@@ -329,22 +329,14 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             }
                         }
                     }
-                } else if (nextDevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver){
-                    photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) device.getDeviceDriver();
-                    if (photoelectricInspectionSiteDeviceDriver.getMove() == 0){
-                        if (this.getNow_steps_type() == 4) {
-                            this.writing("to_command", "4");
-                            this.setNow_steps_type(5);
-                        } else {
-                            logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
-                        }
+                } else {
+                    if (this.getNow_steps_type() == 4) {
+                        this.writing("to_command", "4");
+                        this.setNow_steps_type(5);
                     } else {
-                        if (this.getNow_steps_type() == 4) {
-                            if (photoelectricInspectionSiteDeviceDriver.getMove() != 0){
-                                feedMessage = "烘箱对接位有货不允许放货!";
-                            }
-                        }
+                        logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
                     }
+
                 }
             } else {
                 if (this.getNow_steps_type() == 4) {
@@ -456,10 +448,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 
             //行架机械手申请任务
             if (mode == 2 && move == 0 && task == 0 && !requireSucess) {
-                applyTask();
-                notCreateInstMessage = "";
-                notCreateTaskMessage = "";
-                feedMessage = "";
+                boolean res = applyTask();
+                if (res){
+                    notCreateInstMessage = "";
+                    notCreateTaskMessage = "";
+                    feedMessage = "";
+                }
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
@@ -533,31 +527,31 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     PhotoelectricInspectionSiteDeviceDriver photoelectricInspectionSiteDeviceDriver;
                     HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
 
-                    if (startdevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver){
+                    if (startdevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver) {
                         photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) startdevice.getDeviceDriver();
-                        if (photoelectricInspectionSiteDeviceDriver.getMove() != 1){
+                        if (photoelectricInspectionSiteDeviceDriver.getMove() != 1) {
                             notCreateInstMessage = "手动创建指令未下发电气信号原因->取货位-烘箱对接位:" + photoelectricInspectionSiteDeviceDriver.getDevice_code() + "无货,无法下发指令!";
                             return false;
                         }
                     }
-                    if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver){
+                    if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                         hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
-                        if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 0){
+                        if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 0) {
                             notCreateInstMessage = "手动创建指令未下发电气信号原因->取货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "无货,无法下发指令!";
                             return false;
                         }
                     }
 
-                    if (nextdevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver){
+                    if (nextdevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver) {
                         photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) nextdevice.getDeviceDriver();
-                        if (photoelectricInspectionSiteDeviceDriver.getMove() != 0){
+                        if (photoelectricInspectionSiteDeviceDriver.getMove() != 0) {
                             notCreateInstMessage = "手动创建指令未下发电气信号原因->放货位-烘箱对接位:" + photoelectricInspectionSiteDeviceDriver.getDevice_code() + "有货,无法下发指令!";
                             return false;
                         }
                     }
-                    if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver){
+                    if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                         hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextdevice.getDeviceDriver();
-                        if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 1){
+                        if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 1) {
                             notCreateInstMessage = "手动创建指令未下发电气信号原因->放货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "有货,无法下发指令!";
                             return false;
                         }
@@ -604,31 +598,31 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 Device startdevice = deviceAppService.findDeviceByCode(task.getStart_device_code());
                 PhotoelectricInspectionSiteDeviceDriver photoelectricInspectionSiteDeviceDriver;
                 HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
-                if (startdevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver){
+                if (startdevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver) {
                     photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) startdevice.getDeviceDriver();
-                    if (photoelectricInspectionSiteDeviceDriver.getMove() != 1){
+                    if (photoelectricInspectionSiteDeviceDriver.getMove() != 1) {
                         notCreateInstMessage = "就绪任务未创建指令原因->取货位-烘箱对接位:" + photoelectricInspectionSiteDeviceDriver.getDevice_code() + "光电无货,无法生成指令!";
                         return false;
                     }
                 }
-                if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver){
+                if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                     hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
-                    if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 0){
+                    if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 0) {
                         notCreateInstMessage = "就绪任务未创建指令原因->取货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "光电无货,无法生成指令!";
                         return false;
                     }
                 }
 
-                if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver){
+                if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                     hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextdevice.getDeviceDriver();
-                    if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 1){
+                    if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 1) {
                         notCreateInstMessage = "就绪任务未创建指令原因->放货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "光电有货,无法生成指令!";
                         return false;
                     }
                 }
-                if (nextdevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver){
+                if (nextdevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver) {
                     photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) nextdevice.getDeviceDriver();
-                    if (photoelectricInspectionSiteDeviceDriver.getMove() != 0){
+                    if (photoelectricInspectionSiteDeviceDriver.getMove() != 0) {
                         notCreateInstMessage = "就绪任务未创建指令原因->放货位-烘箱对接位:" + photoelectricInspectionSiteDeviceDriver.getDevice_code() + "光电有货,无法生成指令!";
                         return false;
                     }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/photoelectric_inspection_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/photoelectric_inspection_site/ItemProtocol.java
index 818671211..86c1c39c9 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/photoelectric_inspection_site/ItemProtocol.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/photoelectric_inspection_site/ItemProtocol.java
@@ -46,7 +46,7 @@ public class ItemProtocol {
 
     public static List<ItemDto> getReadableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2"));
+        list.add(new ItemDto(item_move, "光电开关信号", "DB5.B10"));
         return list;
     }
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
index aae27cd6d..9c262c857 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
@@ -681,10 +681,12 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                             }
                         }
                         //没有生成异常取放货工位的任务 就生成正常关联取放货工位的任务
-                        instruction_require();
-                        feedMessage = "";
-                        notCreateInstMessage = "";
-                        notCreateTaskMessage = "";
+                        boolean res = instruction_require();
+                        if (res){
+                            feedMessage = "";
+                            notCreateInstMessage = "";
+                            notCreateTaskMessage = "";
+                        }
                     } else {
 
                         if (!requireSucess) {