diff --git a/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java b/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
index 5312216..1d4cf81 100644
--- a/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
+++ b/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -131,6 +132,28 @@ public class AgvTaskController extends BaseController {
return ajaxResult;
}
+
+ @GetMapping( "/editagv/{id}")
+ public String edit(@PathVariable("id") Integer id, ModelMap mmap){
+ AgvTask agvTask = acsService.getById(id);
+ mmap.put("agvTask", agvTask);
+ return prefix + "/editagv";
+ }
+
+ @RequiresPermissions("task:taskHeader:edit")
+ @PostMapping("/editagv")
+ @ResponseBody
+ @Log(title = "任务-任务管理", operating = "编辑agv任务", action = BusinessType.UPDATE)
+ public AjaxResult edit(AgvTask agvTask) {
+ AgvTask agvTaskResult = acsService.getById(agvTask.getId());
+ if(agvTaskResult.getStatus()>=QuantityConstant.TASK_STATUS_RELEASE){
+ return AjaxResult.error("任务已经下发了，不允许修改");
+ }
+ agvTask.setUpdated(new Date());
+ return toAjax(acsService.updateById(agvTask));
+ }
+
+
@Log(title = "任务-任务管理", operating = "取消AGV任务", action = BusinessType.DELETE)
@PostMapping( "/cancelAGVTask")
@ResponseBody
diff --git a/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java b/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
index d5bb3f1..a647b0f 100644
--- a/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
+++ b/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
@@ -80,6 +80,7 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac
checkContainerAndPositionStatus(agvTask);
agvTask.setStatus(QuantityConstant.TASK_STATUS_BUILD);
agvTask.setCreatedBy(ShiroUtils.getLoginName());
+ agvTask.setTaskType(QuantityConstant.STATUS_TASK_CARRY);
agvTask.setCreatedTime(new Date());
agvTask.setUpdated(new Date());
agvTask.setUpdatedBy(ShiroUtils.getLoginName());
diff --git a/src/main/resources/templates/task/taskHeader/editagv.html b/src/main/resources/templates/task/taskHeader/editagv.html
new file mode 100644
index 0000000..82b38d4
--- /dev/null
+++ b/src/main/resources/templates/task/taskHeader/editagv.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+ <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-agv-edit" th:object="${agvTask}">
+ <input id="id" name="id" th:field="*{id}" type="hidden">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">容器编码：</label>
+ <div class="col-sm-8">
+ <input id="code" name="code" th:field="*{containerCode}" class="form-control" type="text" readonly="true">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">目标点位：</label>
+ <div class="col-sm-8">
+ <input id="toPort" name="toPort" th:field="*{toPort}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">优先级：</label>
+ <div class="col-sm-8">
+ <input id="priority" name="priority" th:field="*{priority}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="form-control-static col-sm-offset-9">
+ <button type="submit" class="btn btn-primary">提交</button>
+ <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ <div th:include="include::footer"></div>
+ <script type="text/javascript">
+ var prefix = ctx + "agv"
+ $("#form-agv-edit").validate({
+ rules:{
+ xxxx:{
+ required:true,
+ },
+ },
+ submitHandler: function(form) {
+ $.ajax({
+ cache : true,
+ type : "POST",
+ url : prefix + "/editagv",
+ data : {
+ "id": $("input[name='id']").val(),
+ "containerCode": $("input[name='containerCode']").val(),
+ "toPort" : $("input[name='toPort']").val(),
+ "priority" : $("input[name='priority']").val(),
+ },
+ async : false,
+ error : function(request) {
+ $.modal.alertError("请求失败！");
+ },
+ success : function(data) {
+ $.operate.saveSuccess(data);
+ }
+ });
+ }
+ });
+ </script>
+</body>
+</html>