diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
index 8b49f8fc6..f7c30b7a5 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
@@ -259,12 +259,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                             luceneExecuteLogService.deviceExecuteLog(logDto);
                         }
                     } else {
-                        log.info("等待LMS系统进行确认允许取货，设备号{},指令号{}", device_code, ikey);
-                        message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey;
+                        log.info("等待LMS系统进行确认允许取货，设备号{},option值{}", standardOrdinarySiteDeviceDriver.getDevice_code(), standardOrdinarySiteDeviceDriver.getOption());
                         logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code() + ",指令号" + ikey);
                         LuceneLogDto logDto = LuceneLogDto.builder()
-                                .device_code(this.getDeviceCode())
-                                .content("等待LMS系统进行确认允许取货,设备号" + device.getDevice_code() + ",指令号" + ikey)
+                                .device_code(standardOrdinarySiteDeviceDriver.getDevice_code())
+                                .content("等待LMS系统进行确认允许取货,设备号" + standardOrdinarySiteDeviceDriver.getDevice_code() + ",option当前值" + standardOrdinarySiteDeviceDriver.getOption())
                                 .build();
                         logDto.setLog_level(4);
                         luceneExecuteLogService.deviceExecuteLog(logDto);
@@ -305,7 +304,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                 }
             } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
                 manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
                 try {
                     manipulatorAgvStationDeviceDriver.writing(2);
                 } catch (Exception e) {
@@ -320,11 +318,10 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                     logDto.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto);
                 } else {
-                    message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "行架不允许取货条件";
-                    log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
+                    log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", manipulatorAgvStationDeviceDriver.getDeviceCode(), manipulatorAgvStationDeviceDriver.getAction(), ikey);
                     LuceneLogDto logDto = LuceneLogDto.builder()
-                            .device_code(this.getDeviceCode())
-                            .content(message)
+                            .device_code(manipulatorAgvStationDeviceDriver.getDeviceCode())
+                            .content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1")
                             .build();
                     logDto.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto);
@@ -766,12 +763,12 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                             luceneExecuteLogService.deviceExecuteLog(logDto);
                         }
                     } else {
-                        log.info("等待LMS系统进行确认允许取货，设备号{},指令号{}", device_code, ikey);
-                        message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey;
-                        logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code());
+                        log.info("等待LMS系统进行确认允许取货，设备号{},option值{}", standardOrdinarySiteDeviceDriver.getDeviceCode(), standardOrdinarySiteDeviceDriver.getOption());
+                        message = "等待LMS系统进行确认允许取货,设备号:" + standardOrdinarySiteDeviceDriver.getDeviceCode() + ",option值:" + standardOrdinarySiteDeviceDriver.getOption();
+                        logServer.deviceExecuteLog(standardOrdinarySiteDeviceDriver.getDeviceCode(), "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code());
                         LuceneLogDto logDto = LuceneLogDto.builder()
-                                .device_code(this.getDeviceCode())
-                                .content(message)
+                                .device_code(standardOrdinarySiteDeviceDriver.getDeviceCode())
+                                .content(standardOrdinarySiteDeviceDriver.getDevice_code() + "option值不为1")
                                 .build();
                         logDto.setLog_level(4);
                         luceneExecuteLogService.deviceExecuteLog(logDto);
@@ -804,7 +801,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                 } else {
                     message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
                     LuceneLogDto logDto = LuceneLogDto.builder()
-                            .device_code(this.getDeviceCode())
+                            .device_code(manipulatorAgvStationDeviceDriver.getDevice_code())
                             .content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1")
                             .build();
                     logDto.setLog_level(4);
@@ -1008,7 +1005,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                     } else {
                         message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
                         LuceneLogDto logDto = LuceneLogDto.builder()
-                                .device_code(this.getDeviceCode())
+                                .device_code(manipulatorAgvStationDeviceDriver.getDeviceCode())
                                 .content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1")
                                 .build();
                         logDto.setLog_level(4);
@@ -1035,7 +1032,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                     } else {
                         message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
                         LuceneLogDto logDto = LuceneLogDto.builder()
-                                .device_code(this.getDeviceCode())
+                                .device_code(manipulatorAgvStationDeviceDriver.getDeviceCode())
                                 .content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1")
                                 .build();
                         logDto.setLog_level(4);
@@ -1087,9 +1084,9 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                         logDto.setLog_level(4);
                         luceneExecuteLogService.deviceExecuteLog(logDto);
                     } else {
-                        message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
+                        message = "设备号:" + manipulatorAgvStationDeviceDriver.getDevice_code() + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
                         LuceneLogDto logDto = LuceneLogDto.builder()
-                                .device_code(this.getDeviceCode())
+                                .device_code(manipulatorAgvStationDeviceDriver.getDeviceCode())
                                 .content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1")
                                 .build();
                         logDto.setLog_level(4);
@@ -1433,8 +1430,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                     message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
                     log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
                     LuceneLogDto logDto = LuceneLogDto.builder()
-                            .device_code(this.getDeviceCode())
-                            .content(message)
+                            .device_code(manipulatorAgvStationDeviceDriver.getDeviceCode())
+                            .content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1")
                             .build();
                     logDto.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto);
@@ -1861,8 +1858,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                     message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
                     log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
                     LuceneLogDto logDto = LuceneLogDto.builder()
-                            .device_code(this.getDeviceCode())
-                            .content(message)
+                            .device_code(manipulatorAgvStationDeviceDriver.getDeviceCode())
+                            .content(manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为1")
                             .build();
                     logDto.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto);
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index 578e70d14..0c970f40a 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -463,16 +463,6 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     list.add(map2);
                     list.add(map3);
                     this.writing(list);
-                    if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                        EXECUTOR.execute(() -> {
-                            toOpenDoor(startdevice);
-                        });
-                    }
-                    if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                        EXECUTOR.execute(() -> {
-                            toOpenDoor(nextdevice);
-                        });
-                    }
                     this.setRequireSucess(true);
                     return true;
                 } else {
@@ -671,16 +661,6 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 list.add(map2);
                 list.add(map3);
                 this.writing(list);
-                if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                    EXECUTOR.execute(() -> {
-                        toOpenDoor(startdevice);
-                    });
-                }
-                if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                    EXECUTOR.execute(() -> {
-                        toOpenDoor(nextdevice);
-                    });
-                }
                 this.setRequireSucess(true);
                 notCreateInstMessage = "";
                 notCreateTaskMessage = "";
@@ -876,9 +856,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
                     if (device.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                         hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) device.getDeviceDriver();
-//                        EXECUTOR.submit(() -> {
+                        EXECUTOR.execute(() -> {
                             toOpenDoor(device);
-//                        });
+                        });
                         int mode = hongXiangConveyorDeviceDriver.getMode();
                         int door = hongXiangConveyorDeviceDriver.getDoor();
                         int action = hongXiangConveyorDeviceDriver.getAction();
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java
index f43d0b5fc..fe01c9995 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java
@@ -187,7 +187,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
             x_position = this.itemProtocol.getX_position();
             y_position = this.itemProtocol.getY_position();
 
-            if (mode != last_mode) {
+            if (action != last_action) {
                 requireSucess = false;
             }
 
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index d6a37a495..ccc9184cb 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -482,10 +482,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     log.info("向lms申请套管工位请求----返回参数{}", e.getMessage());
                     applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class);
                     LuceneLogDto luceneLogDto = new LuceneLogDto(4, "applyPlugPullSiteRequest", String.valueOf(applyPlugPullSitResponse.getstatus()),
-                            JSON.toJSONString(param), String.valueOf(result), "向lms申请套管工位请求失败");
+                            JSON.toJSONString(param),
+                            String.valueOf(result), "向lms申请套管工位请求失败");
                     luceneLogService.interfaceExecuteLog(luceneLogDto);
                 }
-
             }
             return applyPlugPullSitResponse;
         } finally {