fix task

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,6 +52,16 @@ public class TaskController {
         taskService.updateTask(updateReqVO);
         return success(true);
     }
+    @GetMapping("/changeStatus")
+    @Operation(summary = "更改任务单状态")
+    public CommonResult<Boolean> changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
+        TaskDO task = taskService.getTask(id);
+        task.setStatus(status);
+        if(status.equals(TaskStatusEnum.下达.getValue()))
+            task.setOrderDate(LocalDateTime.now());
+        int result = taskService.updateTask(task);
+        return success(true);
+    }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除生产任务单")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskSaveReqVO.java

@@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -20,7 +19,6 @@ public class TaskSaveReqVO {
     private Long id;
 
     @Schema(description = "编码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "编码不能为空")
     private String code;
 
     @Schema(description = "下达日期")
@@ -33,7 +31,6 @@ public class TaskSaveReqVO {
     private LocalDateTime deliveryDate;
 
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "状态不能为空")
     private Integer status;
 
     @Schema(description = "流程实例的编号", example = "13815")
@@ -43,7 +40,6 @@ public class TaskSaveReqVO {
     private String remark;
 
     @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
-
     private Boolean isEnable;
 
     @Schema(description = "生产任务单明细列表")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskService.java

@@ -39,7 +39,7 @@ public interface TaskService {
      * @param updateReqVO 更新信息
      */
     void updateTask(@Valid TaskSaveReqVO updateReqVO);
-
+    int updateTask(TaskDO taskDO);
     /**
      * 删除生产任务单
      *

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanStatusEnum;
 import cn.iocoder.yudao.module.mes.controller.admin.task.vo.TaskDetailRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.task.vo.TaskPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.task.vo.TaskSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.task.vo.TaskStatusEnum;
 import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.task.TaskDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.task.TaskDetailDO;
@@ -65,10 +66,12 @@ public class TaskServiceImpl implements TaskService {
             }
             task.setCode(no);
         }
+        createReqVO.setStatus(TaskStatusEnum.草稿.getValue());
         taskMapper.insert(task);
 
         // 插入子表
-        // createTaskDetailList(task.getId(), createReqVO.getTaskDetails());
+        if(createReqVO.getTaskDetails()!=null && createReqVO.getTaskDetails().size()>0)
+            createTaskDetailList(task.getId(), createReqVO.getTaskDetails());
         // 返回
         return task.getId();
     }
@@ -83,9 +86,13 @@ public class TaskServiceImpl implements TaskService {
         taskMapper.updateById(updateObj);
 
         // 更新子表
-        //updateTaskDetailList(updateReqVO.getId(), updateReqVO.getTaskDetails());
+        if(updateReqVO.getTaskDetails()!=null && updateReqVO.getTaskDetails().size()>0)
+            updateTaskDetailList(updateReqVO.getId(), updateReqVO.getTaskDetails());
+    }
+    @Override
+    public int updateTask(TaskDO taskDO){
+       return  taskMapper.updateById(taskDO);
     }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteTask(Long id) {