|
@@ -1,5 +1,6 @@
|
|
|
package com.ruoyi.xuankuang.controller;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ruoyi.ams.xuankuang.domain.form.*;
|
|
|
import com.ruoyi.ams.xuankuang.service.WcsToWmsApiService;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
@@ -40,7 +41,7 @@ public class WcsToWmsApiController {
|
|
|
@PostMapping("/stackingCompletion")
|
|
|
public AjaxResult stackingCompletion(@RequestBody StackingCompletionForm stackingCompletion) {
|
|
|
AjaxResult ajaxResult;
|
|
|
- log.info("WcsToWmsApiController - stackingCompletion request stackingCompletion is :{}, time is :{}", stackingCompletion, DateUtils.getTime());
|
|
|
+ log.info("WcsToWmsApiController - stackingCompletion request stackingCompletion is :{}, time is :{}", JSONObject.toJSONString(stackingCompletion), DateUtils.getTime());
|
|
|
synchronized(this) {
|
|
|
ajaxResult = wcsToWmsApiService.stackingCompletion(stackingCompletion);
|
|
|
}
|
|
@@ -57,7 +58,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("任务状态反馈")
|
|
|
@PostMapping("/taskStatusResponse")
|
|
|
public AjaxResult taskStatusResponse(@RequestBody TaskStatusForm taskStatusForm) {
|
|
|
- log.info("WcsToWmsApiController - taskStatusResponse request taskStatusForm is :{}, time is :{}", taskStatusForm, DateUtils.getTime());
|
|
|
+ log.info("WcsToWmsApiController - taskStatusResponse request taskStatusForm is :{}, time is :{}", JSONObject.toJSONString(taskStatusForm), DateUtils.getTime());
|
|
|
AjaxResult ajaxResult;
|
|
|
synchronized(this) {
|
|
|
ajaxResult = wcsToWmsApiService.taskStatusResponse(taskStatusForm);
|
|
@@ -75,7 +76,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("破袋机开启通知")
|
|
|
@PostMapping("/lineOpenNotification")
|
|
|
public AjaxResult lineOpenNotification(@RequestBody LineOpenNotificationForm lineOpenNotificationForm) {
|
|
|
- log.info("WcsToWmsApiController - lineOpenNotification request lineOpenNotificationForm is :{}, time is :{}", lineOpenNotificationForm, DateUtils.getTime());
|
|
|
+ log.info("WcsToWmsApiController - lineOpenNotification request lineOpenNotificationForm is :{}, time is :{}", JSONObject.toJSONString(lineOpenNotificationForm), DateUtils.getTime());
|
|
|
AjaxResult ajaxResult = wcsToWmsApiService.lineOpenNotification(lineOpenNotificationForm);
|
|
|
log.info("WcsToWmsApiController - lineOpenNotification response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
|
|
|
return ajaxResult;
|
|
@@ -90,7 +91,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("空托仓位请求")
|
|
|
@PostMapping("/emptyPalletLocRequest")
|
|
|
public AjaxResult emptyPalletLocRequest(@RequestBody EmptyPalletLocForm emptyPalletLocForm) {
|
|
|
- log.info("WcsToWmsApiController - emptyPalletLocRequest request emptyPalletLocForm is :{}, time is :{}", emptyPalletLocForm, DateUtils.getTime());
|
|
|
+ log.info("WcsToWmsApiController - emptyPalletLocRequest request emptyPalletLocForm is :{}, time is :{}", JSONObject.toJSONString(emptyPalletLocForm), DateUtils.getTime());
|
|
|
AjaxResult ajaxResult = wcsToWmsApiService.emptyPalletLoc(emptyPalletLocForm);
|
|
|
log.info("WcsToWmsApiController - emptyPalletLocRequest response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
|
|
|
return ajaxResult;
|
|
@@ -105,7 +106,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("异常上报接口")
|
|
|
@PostMapping("/errorStatusResponse")
|
|
|
public AjaxResult errorStatusResponse(@RequestBody ErrorStatusForm errorStatusForm) {
|
|
|
- log.info("WcsToWmsApiController - errorStatusResponse request errorStatusForm is :{}, time is :{}", errorStatusForm, DateUtils.getTime());
|
|
|
+ log.info("WcsToWmsApiController - errorStatusResponse request errorStatusForm is :{}, time is :{}", JSONObject.toJSONString(errorStatusForm), DateUtils.getTime());
|
|
|
log.info("WcsToWmsApiController - errorStatusResponse response ajaxResult is :{}, time is :{}", StringUtils.EMPTY, DateUtils.getTime());
|
|
|
return AjaxResult.success(StringUtils.EMPTY);
|
|
|
}
|
|
@@ -119,7 +120,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("WCS安全交握AGV")
|
|
|
@PostMapping("/callback/task")
|
|
|
public AjaxResult callbackTask(@RequestBody CallbackTaskForm callbackForm) {
|
|
|
- log.info("WcsToWmsApiController - callbackTask request callbackForm is :{}, time is :{}", callbackForm, DateUtils.getTime());
|
|
|
+ log.info("WcsToWmsApiController - callbackTask request callbackForm is :{}, time is :{}", JSONObject.toJSONString(callbackForm), DateUtils.getTime());
|
|
|
Boolean data = wcsToWmsApiService.callbackNotice(callbackForm);
|
|
|
log.info("WcsToWmsApiController - callbackTask response data is :{}, time is :{}", data, DateUtils.getTime());
|
|
|
return AjaxResult.success(data);
|
|
@@ -134,7 +135,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("WCS出库任务下发AGV")
|
|
|
@PostMapping("/outboundRequest")
|
|
|
public AjaxResult outboundRequest(@RequestBody OutboundForm outboundForm) {
|
|
|
- log.info("WcsToWmsApiController - outboundRequest request outboundForm is :{}, time is :{}", outboundForm, DateUtils.getTime());
|
|
|
+ log.info("WcsToWmsApiController - outboundRequest request outboundForm is :{}, time is :{}", JSONObject.toJSONString(outboundForm), DateUtils.getTime());
|
|
|
AjaxResult ajaxResult = wcsToWmsApiService.outboundRequest(outboundForm);
|
|
|
log.info("WcsToWmsApiController - outboundRequest response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
|
|
|
return ajaxResult;
|
|
@@ -148,7 +149,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("入库数量不足更新数据")
|
|
|
@PostMapping("/updateAsnData")
|
|
|
public AjaxResult updateAsnData(@RequestBody UpdateForm updateForm) {
|
|
|
- log.info("WcsToWmsApiController - updateAsnData request updateForm is :{}, time is :{}", updateForm, DateUtils.getTime());
|
|
|
+ log.info("WcsToWmsApiController - updateAsnData request updateForm is :{}, time is :{}", JSONObject.toJSONString(updateForm), DateUtils.getTime());
|
|
|
AjaxResult ajaxResult = wcsToWmsApiService.updateAsnData(updateForm);
|
|
|
log.info("WcsToWmsApiController - updateAsnData response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
|
|
|
return ajaxResult;
|