rev：添加日志

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java

@@ -74,7 +74,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Transactional(rollbackFor = Exception.class)
     @SneakyThrows
     public BaseResponse receiveTaskStatusAcs(JSONObject whereJson) {
-        log.info("acs向lms反馈任务状态，请求参数：--------------------------------------" + whereJson.toString());
+        log.info("ACS向WMS反馈任务状态，请求参数：--------------------------------------" + whereJson.toString());
         // 任务标识
         String task_id = whereJson.getString("task_id");
         // acs反馈的任务类型
@@ -112,7 +112,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             }
         }
 
-        log.info("acs向lms反馈任务状态，返回参数：--------------------------------------" + BaseResponse.responseOk().toString());
+        log.info("ACS向WMS反馈任务状态，返回参数：--------------------------------------" + BaseResponse.responseOk().toString());
         return BaseResponse.responseOk();
     }
 
@@ -120,7 +120,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Transactional(rollbackFor = Exception.class)
     @SneakyThrows
     public BaseResponse resultCar(JSONObject whereJson) {
-        log.info("acs向lms反馈任务车号，请求参数：--------------------------------------" + whereJson.toString());
+        log.info("ACS向WMS反馈任务车号，请求参数：--------------------------------------" + whereJson.toString());
         // 任务标识
         String task_id = whereJson.getString("task_id");
         // 车号
@@ -144,12 +144,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 lock.unlock();
             }
         }
+        log.info("ACS向WMS反馈任务车号，返回参数：--------------------------------------" + BaseResponse.responseOk().toString());
         return BaseResponse.responseOk();
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse resultWeigh(JSONObject whereJson) {
+        log.info("ACS向WMS反馈重量，请求参数：--------------------------------------" + whereJson.toString());
+
         double weigh_qty = whereJson.getDoubleValue("weigh_qty");
         if (ObjectUtil.isEmpty(weigh_qty) || weigh_qty == 0) {
             throw new BadRequestException("称重称量不能为空或者0!");
@@ -174,12 +177,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         // 调用任务类重量反馈方法
         AbstractTask task = taskFactory.getTask(taskDao.getConfig_code());
         JSONObject resultWeigh = task.resultWeigh(taskDao);
+
+        log.info("ACS向WMS反馈重量，返回参数：--------------------------------------" + BaseResponse.responseOk(resultWeigh).toString());
         return BaseResponse.responseOk(resultWeigh);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse isPutVehicle(JSONObject whereJson) {
+        log.info("ACS向WMS请求是否可以取放货，请求参数：--------------------------------------" + whereJson.toString());
+
         // 查询当前任务
         SchBaseTask taskDao = iSchBaseTaskService.getByCode(whereJson.getString("task_code"));
         // 查询当前点位
@@ -201,6 +208,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
 
         data.put("is_confirm", IOSConstant.ONE);
+
+        log.info("ACS向WMS请求是否可以取放货，返回参数：--------------------------------------" + BaseResponse.responseOk(data).toString());
         return BaseResponse.responseOk(data);
     }
 }

wms/nladmin-system/nlsso-server/src/main/resources/config/application.yml

@@ -192,7 +192,7 @@ file:
   avatarMaxSize: 5
 logging:
   file:
-    path: D:\log\beian\lms
+    path: D:\log\XuGong\wms
   config: classpath:logback-spring.xml
 # sa-token白名单配置
 security:

wms/nladmin-system/nlsso-server/src/main/resources/log/AcsToWms.xml

@@ -3,10 +3,10 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!-- 按照每天生成日志文件 -->
-    <appender name="FILE_ERPTOWMS" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="FILE_ACSTOWMS" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ErpToWms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/AcsToWms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
@@ -22,7 +22,7 @@
 
     </appender>
     <!-- 打印sql -->
-    <logger name="org.nl.wms.ext.service.impl.ErpToWmsServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE_ERPTOWMS"/>
+    <logger name="org.nl.wms.ext.service.impl.AcsToWmsServiceImpl" level="info" additivity="false">
+        <appender-ref ref="FILE_ACSTOWMS"/>
     </logger>
 </included>

wms/nladmin-system/nlsso-server/src/main/resources/log/WmsToErp.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE_WMSTOERP" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/WmsToErp/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>2GB</totalSizeCap>
-        </rollingPolicy>
-        <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>
-    <!-- 打印sql -->
-    <logger name="org.nl.wms.ext.service.impl.WmsToErpServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE_WMSTOERP"/>
-    </logger>
-</included>

wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -15,9 +15,8 @@ https://juejin.cn/post/6844903775631572999
               value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %blue(%msg%n)"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!--引入默认的一些设置-->
-    <include resource="log/WmsToErp.xml"/>
-    <include resource="log/ErpToWms.xml"/>
     <include resource="log/SendAcsTask.xml"/>
+    <include resource="log/AcsToWms.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <!--withJansi 参数改为true-->