diff --git a/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/agv/AgvTaskReturn.java b/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/agv/AgvTaskReturn.java index 60bc6f7..cc8848f 100644 --- a/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/agv/AgvTaskReturn.java +++ b/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/agv/AgvTaskReturn.java @@ -36,6 +36,7 @@ public class AgvTaskReturn implements HandlerService { taskDetail.setCreator(Msg.AGV); taskDetail.setTaskId(jsonObject.getString("TASK_ID")); taskDetail.setTaskStatus(jsonObject.getString("TASK_STATUS")); + taskDetail.setCarrierNo(jsonObject.getString("CARRIER_NO")); taskDetail.setCompletedDate(Local.toLocalDateTime(jsonObject.getString("COMPLETED_DATE"), "yyyy-MM-dd HH:mm:ss")); String message = remoteAgvTaskService.taskReply(taskDetail).getData(); @@ -59,6 +60,7 @@ public class AgvTaskReturn implements HandlerService { } String taskId = jsonObject.getString("TASK_ID"); String taskStatus = jsonObject.getString("TASK_STATUS"); + String carrierNo = jsonObject.getString("CARRIER_NO"); String completedDate = jsonObject.getString("COMPLETED_DATE"); if(StrUtil.isBlank(taskId)) { return "TASK_ID不能为空"; @@ -66,6 +68,9 @@ public class AgvTaskReturn implements HandlerService { if(StrUtil.isBlank(taskStatus)) { return "TASK_STATUS不能为空"; } + if(StrUtil.isBlank(carrierNo)) { + return "CARRIER_NO不能为空"; + } if(StrUtil.isBlank(completedDate)) { return "COMPLETED_DATE不能为空"; }