|
@@ -1,5 +1,8 @@
|
|
|
package com.ruoyi.xuankuang.controller;
|
|
|
|
|
|
+import cn.hutool.log.Log;
|
|
|
+import com.ruoyi.ams.task.domain.WcsTask;
|
|
|
+import com.ruoyi.ams.task.service.IWcsTaskService;
|
|
|
import com.ruoyi.ams.xuankuang.domain.form.*;
|
|
|
import com.ruoyi.ams.xuankuang.service.WcsToWmsApiService;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
@@ -98,11 +101,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("WCS安全交握AGV")
|
|
|
@PostMapping("/callback/task")
|
|
|
public AjaxResult callbackTask(@RequestBody CallbackTaskFrom callbackTaskFrom) {
|
|
|
- System.out.println(callbackTaskFrom.getTaskNo());
|
|
|
- System.out.println(callbackTaskFrom.getHandshakeType());
|
|
|
- System.out.println(callbackTaskFrom.getMessage());
|
|
|
- System.out.println(callbackTaskFrom.getSafeCode());
|
|
|
- return AjaxResult.success("");
|
|
|
+ return wcsToWmsApiService.secureHandover(callbackTaskFrom);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -114,9 +113,7 @@ public class WcsToWmsApiController {
|
|
|
@ApiOperation("WCS出库任务下发AGV")
|
|
|
@PostMapping("/outboundRequest")
|
|
|
public AjaxResult outboundRequest(@RequestBody OutboundForm outboundForm) {
|
|
|
- System.out.println(outboundForm.getWcsId());
|
|
|
- System.out.println(outboundForm.getPalletNo());
|
|
|
- return AjaxResult.success("任务创建成功");
|
|
|
+ return wcsToWmsApiService.outboundRequest(outboundForm);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -131,4 +128,5 @@ public class WcsToWmsApiController {
|
|
|
return wcsToWmsApiService.updateAsnData(updateForm);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|