diff --git a/acs/nladmin-system/pom.xml b/acs/nladmin-system/pom.xml
index 92dd526a9..4e7942c59 100644
--- a/acs/nladmin-system/pom.xml
+++ b/acs/nladmin-system/pom.xml
@@ -33,6 +33,13 @@
 
     <dependencies>
 
+
+<!--        https://onew.me/logback/2018/09/17/logback_win.html-->
+        <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+            <version>1.9</version>
+        </dependency>
         <!--<dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java
index ff3e155c4..d5e92f4b7 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java
@@ -213,6 +213,7 @@ public class AutoRunServiceImpl implements AutoRunService, ApplicationAutoInitia
                 thread.start();
             } else if (SystemConfig.thread_auto_run.booleanValue() && (!DevelopConfig.develop.booleanValue()
                     || !DevelopConfig.thread_auto_run_force_stop.contains(this.thread_code_index.get(i)))) {
+                thread.setName("test_"+thread.getName());
                 thread.start();
             }
         }
diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml
index 7166054bb..aba8aa0c8 100644
--- a/acs/nladmin-system/src/main/resources/logback-spring.xml
+++ b/acs/nladmin-system/src/main/resources/logback-spring.xml
@@ -46,9 +46,10 @@ https://juejin.cn/post/6844903775631572999
 
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <withJansi>true</withJansi>
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>${log.charset}</charset>
+<!--            <charset>${log.charset}</charset>-->
         </encoder>
     </appender>
 
@@ -68,6 +69,7 @@ https://juejin.cn/post/6844903775631572999
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
         </encoder>
     </appender>
 
diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml
index 8579a3819..48d21902a 100644
--- a/lms/nladmin-system/pom.xml
+++ b/lms/nladmin-system/pom.xml
@@ -57,6 +57,14 @@
             <version>0.9.10</version>
         </dependency>
 
+
+        <!--        https://onew.me/logback/2018/09/17/logback_win.html-->
+        <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+            <version>1.9</version>
+        </dependency>
+
         <!--工具包-->
         <dependency>
             <groupId>cn.hutool</groupId>
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index e26b47f86..df75c2ccd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -135,6 +135,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         result.put("message", "任务状态反馈成功!");
         result.put("data", new JSONObject());
         result.put("errArr", errArr);
+        log.info("receiveTaskStatusAcs返回参数：--------------------------------------" + result.toString());
         return result;
     }
 
@@ -493,6 +494,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 }
                 result.put("status", HttpStatus.OK.value());
                 result.put("message", "下发成功!");
+                log.info("apply返回参数：---------------------------------------------" + result.toString());
                 return result;
             }
         } finally {
@@ -502,6 +504,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
         result.put("status", HttpStatus.BAD_REQUEST.value());
         result.put("message", "申请任务超时！" + type);
+        log.info("apply返回参数：---------------------------------------------" + result.toString());
+
         return result;
     }
 
@@ -602,7 +606,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 lock.unlock();
             }
         }
-
+        log.info("deviceApply返回参数：---------------------------------------------" + result.toString());
         return result;
     }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java
index e81b9e10f..690cb55a5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java
@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.logging.annotation.Log;
-import org.nl.wms.pda.mps.service.CasingService;
 import org.nl.wms.pda.mps.service.OutService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java
index c5ae64ea0..4c49d19d8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java
@@ -73,6 +73,8 @@ public class SendOutTask extends AbstractAcsTask {
 
             JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
             jsonPoint2.put("lock_type", "1");
+            jsonPoint2.put("vehicle_code", "");
+            jsonPoint2.put("point_status", "1");
             pointTab.update(jsonPoint2);
         }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
index f4823bccf..e7fb0d120 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
@@ -292,7 +292,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
             storPublicService.IOStor(jo, "31");
             //锁定起点点位、仓位
             JSONObject from_start = new JSONObject();
-            from_start.put("lock_type", "03");
+            from_start.put("lock_type", "6");
             from_start.put("struct_id", jo.getString("turnout_struct_id"));
             from_start.put("inv_type", jo_mst.getString("bill_type"));
             from_start.put("inv_id", jo_mst.getString("moveinv_id"));
@@ -303,6 +303,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
             storPublicService.updateStructAndPoint(from_start);
             //锁定终点点位、仓位
             from_start.put("struct_id", turnin_struct_id);
+            from_start.put("lock_type", "7");
             storPublicService.updateStructAndPoint(from_start);
         }
         ret.put("total_qty", total_qty);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
index 0db85a0de..6366d4651 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
@@ -89,7 +89,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
         if(TaskStatusEnum.EXECUTING.getCode().equals(status)){
             map.put("work_status","02");
             wo_dtl.update(map,"task_id='"+task_id+"'");
-            map.put("task_status","03");
+            map.put("task_status",TaskStatusEnum.EXECUTING.getCode());
             map.put("update_optid",currentUserId+"");
             map.put("update_optname",nickName);
             map.put("update_time",now);
diff --git a/lms/nladmin-system/src/main/resources/log/ACSToMes.xml b/lms/nladmin-system/src/main/resources/log/AcsToLms.xml
similarity index 95%
rename from lms/nladmin-system/src/main/resources/log/ACSToMes.xml
rename to lms/nladmin-system/src/main/resources/log/AcsToLms.xml
index b3ca345f5..74080ec33 100644
--- a/lms/nladmin-system/src/main/resources/log/ACSToMes.xml
+++ b/lms/nladmin-system/src/main/resources/log/AcsToLms.xml
@@ -6,7 +6,7 @@
     <appender name="FILE5" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ACSToMes/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/AcsToLms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
diff --git a/lms/nladmin-system/src/main/resources/log/MesToACS.xml b/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml
similarity index 95%
rename from lms/nladmin-system/src/main/resources/log/MesToACS.xml
rename to lms/nladmin-system/src/main/resources/log/LmsToAcs.xml
index b0aed616a..ad31a026c 100644
--- a/lms/nladmin-system/src/main/resources/log/MesToACS.xml
+++ b/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml
@@ -6,7 +6,7 @@
     <appender name="FILE6" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/MesToACS/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/LmsToAcs/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index d4ab2b935..036d43bf5 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -14,24 +14,22 @@ https://juejin.cn/post/6844903775631572999
     <property name="log.pattern"
               value="%black(%contextName-) %X{traceId} %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <springProperty scope="context" name="lokiUrl" source="loki.url"/>
     <springProperty scope="context" name="esIndex" source="es.index"/>
-    <springProperty scope="context" name="systemName" source="loki.systemName"/>
-    <property name="LOKI_URL" value="${lokiUrl}"/>
-    <property name="SYSTEM_NAME" value="${systemName}"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!--引入默认的一些设置-->
     <include resource="log/LmsToMes.xml"/>
     <include resource="log/LmsToSap.xml"/>
     <include resource="log/MesToLms.xml"/>
     <include resource="log/SapToLms.xml"/>
-    <include resource="log/ACSToMes.xml"/>
-    <include resource="log/MesToACS.xml"/>
+    <include resource="log/AcsToLMS.xml"/>
+    <include resource="log/LmsToAcs.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--        控制台高亮-->
+        <withJansi>true</withJansi>
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>${log.charset}</charset>
+            <!--            <charset>${log.charset}</charset>-->
         </encoder>
     </appender>
 
@@ -54,7 +52,6 @@ https://juejin.cn/post/6844903775631572999
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>${log.charset}</charset>
         </encoder>
-
     </appender>
 
 
@@ -149,14 +146,14 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="dev">
         <root level="info">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="asyncFileAppender"/>
-            <appender-ref ref="esLogAppender" />
+<!--            <appender-ref ref="asyncFileAppender"/>-->
+            <appender-ref ref="esLogAppender"/>
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
         <logger name="es-logger" level="warn" additivity="false">
-            <appender-ref ref="esLogAppender" />
+            <appender-ref ref="esLogAppender"/>
             <appender-ref ref="CONSOLE"/>
         </logger>
         <logger name="org.apache" level="ERROR" additivity="false">
@@ -199,14 +196,14 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="prod">
         <root level="info">
             <appender-ref ref="asyncFileAppender"/>
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="esLogAppender" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="esLogAppender"/>
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="es-logger" level="warn" additivity="false">
-            <appender-ref ref="esLogAppender" />
+            <appender-ref ref="esLogAppender"/>
             <appender-ref ref="CONSOLE"/>
         </logger>
         <logger name="org.apache" level="ERROR" additivity="false">
@@ -229,23 +226,18 @@ https://juejin.cn/post/6844903775631572999
         </logger>
         <logger name="org.quartz" level="ERROR" additivity="false">
             <appender-ref ref="asyncFileAppender"/>
-
         </logger>
         <logger name="com.google" level="ERROR" additivity="false">
             <appender-ref ref="asyncFileAppender"/>
-
         </logger>
         <logger name="springfox" level="ERROR" additivity="false">
             <appender-ref ref="asyncFileAppender"/>
-
         </logger>
         <logger name="log4jdbc" level="ERROR" additivity="false">
             <appender-ref ref="asyncFileAppender"/>
-
         </logger>
         <logger name="nl.basjes" level="ERROR" additivity="false">
             <appender-ref ref="asyncFileAppender"/>
-
         </logger>
     </springProfile>