diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java index 3e6a90a..0181e7c 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java @@ -56,12 +56,14 @@ public class KMReSController { String id = missionStateCallback.getMissionCode();//作业 id String containerCode = missionStateCallback.getContainerCode();//容器编号 String missionStatus = missionStateCallback.getMissionStatus();//作业当前状态 - - //货架任务 - AgvTaskDto agvTaskDto = agvTaskService.findById(Integer.parseInt(id)); - AgvTask agvTask = agvTaskService.toEntity(agvTaskDto);//转实体 - agvTaskService.agvTaskCallback(agvTask, missionStatus, containerCode); - - return new ResponseEntity<>(ApiResult.success(OK.value(), "", ""), HttpStatus.OK); + try { + //货架任务 + AgvTaskDto agvTaskDto = agvTaskService.findById(Integer.parseInt(id)); + AgvTask agvTask = agvTaskService.toEntity(agvTaskDto);//转实体 + agvTaskService.agvTaskCallback(agvTask, missionStatus, containerCode); + return new ResponseEntity<>(ApiResult.success(OK.value(), "", ""), HttpStatus.OK); + } catch (Exception e) { + return new ResponseEntity<>(ApiResult.fail(BAD_REQUEST.value(), e.getMessage(), ""), HttpStatus.BAD_REQUEST); + } } }