diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
index da0231ba5..246e50729 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
@@ -1011,13 +1011,13 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 requireSucess = false;
                 return true;
             }
-            //判断有没有第二段出库输送指令，有的话则不生成入库指令
-            Instruction byStarCodeAndExcute = instructionService.findByStarCodeAndExcute(next_device_code);
-            if (ObjectUtil.isNotEmpty(byStarCodeAndExcute)) {
-                this.message = "有DDJ对接位出入库的指令";
-                requireSucess = false;
-                return true;
-            }
+            //TODO  判断有没有第二段出库输送指令，有的话则不生成入库指令
+//            Instruction byStarCodeAndExcute = instructionService.findByStarCodeAndExcute(next_device_code);
+//            if (ObjectUtil.isNotEmpty(byStarCodeAndExcute)) {
+//                this.message = "有DDJ对接位出入库的指令";
+//                requireSucess = false;
+//                return true;
+//            }
             //关联站点判断
             Device nextDevice = deviceAppService.findDeviceByCode(next_device_code);
             BeltConveyorDeviceDriver beltConveyorDeviceDriver;
@@ -1037,7 +1037,6 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                             return true;
                         }
                     }
-
                 }
             }
             TaskDto dto = taskserver.findByCodeAndExcute(taskdto.getNext_device_code(), taskdto.getStart_device_code());
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java
index afe7f42a2..8b85f6c6b 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java
@@ -45,7 +45,7 @@ public @interface Log {
      *
      * @return
      */
-    boolean isAddLogTable() default true;
+    boolean isAddLogTable() default false;
 
     /**
      * 是否接口日志
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
index 5fa4444be..53f2ebf11 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
@@ -101,7 +101,6 @@ public class LogAspect {
             log.error("track_id:{},error:{}", trackId, ex.getMessage());
             SysLog log = new SysLog("ERROR", System.currentTimeMillis() - startTime);
             log.setException_detail(ThrowableUtil.getStackTrace(ex).getBytes());
-            logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log);
             throw ex;
         }
         return result;