日志更新

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java

@@ -33,14 +33,14 @@ public class AcsToWmsController {
     private final AcsToWmsService acsToWmsService;
 
     @PostMapping("/apply")
-    @Log("ACS给WMS发送任务")
+    //@Log("ACS给WMS发送任务")
     @ApiOperation("ACS给WMS发送任务")
     public ResponseEntity<Object> receiveTaskFromAcs(@RequestBody Map whereJson) {
         return new ResponseEntity<>( acsToWmsService.receiveTaskFromAcs(whereJson),HttpStatus.OK);
     }
 
     @PostMapping("/manipulatorApply")
-    @Log("ACS机械手给WMS发送任务")
+    //@Log("ACS机械手给WMS发送任务")
     @ApiOperation("ACS机械手给WMS发送任务")
     public ResponseEntity<Object> manipulatorApply(@RequestBody Map whereJson) {
 
@@ -48,14 +48,14 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/group")
-    @Log("ACS扫码器入库组盘")
+    //@Log("ACS扫码器入库组盘")
     @ApiOperation("ACS扫码器组盘")
     public ResponseEntity<Object> group(@RequestBody Map whereJson) {
         return new ResponseEntity<>( acsToWmsService.group(whereJson),HttpStatus.OK);
     }
 
     @PostMapping("/inKiln")
-    @Log("入窑扫码器")
+    //@Log("入窑扫码器")
     @ApiOperation("入窑扫码器")
     public ResponseEntity<Object> inKiln(@RequestBody Map whereJson) {
 
@@ -63,35 +63,35 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/ispackage")
-    @Log("ACS给WMS请求是否自动码垛")
+    //@Log("ACS给WMS请求是否自动码垛")
     @ApiOperation("ACS给WMS请求是否自动码垛")
     public ResponseEntity<Object> ispackage(@RequestBody Map whereJson) {
         return new ResponseEntity<>(acsToWmsService.ispackage(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/getEmptyVehicle_code")
-    @Log("获取空木托盘号")
+    //@Log("获取空木托盘号")
     @ApiOperation("获取空木托盘号")
     public ResponseEntity<Object> getEmptyVehicle_code(@RequestBody Map whereJson) {
         return new ResponseEntity<>(acsToWmsService.getEmptyVehicle_code(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/getDevicecodeByVehicletype")
-    @Log("根据木托盘类型获取对应所在的点位")
+    //@Log("根据木托盘类型获取对应所在的点位")
     @ApiOperation("根据木托盘类型获取对应的点位")
     public ResponseEntity<Object> getDevicecodeByVehicle_ype(@RequestBody Map whereJson) {
         return new ResponseEntity<>(acsToWmsService.getDevicecodeByVehicle_ype(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/getVehicleInfoBycode")
-    @Log("根据编码获取托盘信息")
+    //@Log("根据编码获取托盘信息")
     @ApiOperation("根据编码获取托盘信息")
     public ResponseEntity<Object> getVehicleInfoBycode(@RequestBody Map whereJson) {
         return new ResponseEntity<>(acsToWmsService.getVehicleInfoBycode(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/sureProduceTask")
-    @Log("排产单确认")
+    //@Log("排产单确认")
     @ApiOperation("排产单确认")
     public ResponseEntity<Object> sureProduceTask(@RequestBody Map whereJson) {
 
@@ -99,7 +99,7 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/updateVehicleType")
-    @Log("更新覆膜机的点位状态")
+    //@Log("更新覆膜机的点位状态")
     @ApiOperation("更新覆膜机的点位状态")
     public ResponseEntity<Object> updateVehicleType(@RequestBody Map whereJson) {
         acsToWmsService.updateVehicleType(whereJson);
@@ -107,33 +107,33 @@ public class AcsToWmsController {
     }
 
     @AnonymousPostMapping("/status")
-    @Log("ACS给WMS反馈任务状态")
+    //@Log("ACS给WMS反馈任务状态")
     @ApiOperation("ACS给WMS反馈任务状态")
     public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody String material_code) {
         return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(material_code), HttpStatus.OK);
     }
     @PostMapping("/agv")
-    @Log("ACS给WMS反馈任务状态")
+    //@Log("ACS给WMS反馈任务状态")
     @ApiOperation("ACS给WMS反馈任务状态")
     public ResponseEntity<Object> receiveAgvStatus(@RequestBody JSONArray arr ) {
         return new ResponseEntity<>(acsToWmsService.receiveAgvStatus( arr), HttpStatus.OK);
     }
 
     @PostMapping("/queryCribbingInfo")
-    @Log("获取木托盘垛形信息")
+    //@Log("获取木托盘垛形信息")
     @ApiOperation("获取木托盘垛形信息")
     public ResponseEntity<Object> queryCribbingInfo(@RequestBody Map whereJson) {
         return new ResponseEntity<>(acsToWmsService.queryCribbingInfo(whereJson), HttpStatus.OK);
     }
     @PostMapping("/queryPrintInfoByCode")
-    @Log("获取打印信息")
+    //@Log("获取打印信息")
     @ApiOperation("获取木托盘垛形信息")
     public ResponseEntity<Object> queryPrintInfoByCode(@RequestBody Map whereJson) {
         return new ResponseEntity<>(acsToWmsService.queryPrintInfoByCode(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/deleteTask")
-    @Log("删除下料到货架的未完成的任务")
+    //@Log("删除下料到货架的未完成的任务")
     @ApiOperation("删除下料到货架的未完成的任务")
     public ResponseEntity<Object> deleteTask(@RequestBody Map whereJson) {
         return new ResponseEntity<>(acsToWmsService.deleteTask(whereJson), HttpStatus.OK);

wms/hd/nladmin-system/src/main/resources/AutoAcsToWms.xml

@@ -17,6 +17,7 @@
         <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>utf-8</charset>
         </encoder>
     </appender>
 

wms/hd/nladmin-system/src/main/resources/AutoWmsToJn.xml

@@ -17,6 +17,7 @@
         <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>utf-8</charset>
         </encoder>
     </appender>
 

wms/hd/nladmin-system/src/main/resources/WmsToJn.xml

@@ -17,6 +17,7 @@
         <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>utf-8</charset>
         </encoder>
     </appender>