rev:优化日志检索页面

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java

@@ -361,12 +361,21 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
                     requireSucess = true;
                     logServer.deviceExecuteLog(this.device_code, "", "", "申请套管,返回参数:" + applyPlugPullSitResponse);
                     message = "申请套管成功";
-                } else {
+                }
+                if (StrUtil.equals("2", is_bushing)){
+                    Map<String, Object> map = new LinkedHashMap<>();
+                    map.put("to_command", 97);
+                    this.writing(map);
+                    requireSucess = true;
+                    message = "不套管,送空气轴";
+                    logServer.deviceExecuteLog(this.device_code, "", "", "不申请套管反馈,返回参数:" + applyPlugPullSitResponse);
+                }
+                if (StrUtil.equals("0", is_bushing)){
                     Map<String, Object> map = new LinkedHashMap<>();
                     map.put("to_command", 98);
                     this.writing(map);
                     requireSucess = true;
-                    message = "不申请套管";
+                    message = "缺少纸管,人工确认";
                     logServer.deviceExecuteLog(this.device_code, "", "", "不申请套管反馈,返回参数:" + applyPlugPullSitResponse);
                 }
             } else {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java

@@ -373,7 +373,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                     }
                 }
             }
-            
+
             if (!ObjectUtil.isEmpty(task)) {
                 this.executeReadyTask(task);
             } else {