From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 11 十月 2024 08:39:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java index 88b1494..0157fee 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java @@ -1,5 +1,7 @@ package com.mes.storagetask.controller; +import com.mes.shelfrack.entity.request.RawUsageAndShelfRack; +import com.mes.storagetask.entity.request.StorageTaskRequest; import com.mes.utils.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -15,6 +17,8 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.GetMapping; import java.util.List; +import java.util.Map; +import java.util.Optional; /** * @@ -99,4 +103,27 @@ return Result.success(result); } + + @ApiOperation(value = "浠诲姟鏌ヨ",notes = "浠诲姟鏌ヨ",produces = "application/json") + @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")}) + @GetMapping("/findTasks") + public Result findLatestTasks() { + List<StorageTaskRequest> result = storageTaskService.Tasks(); + return Result.success(result); + } + + + + @ApiOperation(value = "浠诲姟鎿嶄綔", notes = "浠诲姟鎿嶄綔") + @PostMapping("/taskUpdate") + public Result taskUpdate(@RequestBody Map<String, Object> storageTaskMap) { + + StorageTask task = new StorageTask(); + task.setType((String) storageTaskMap.get("Type")); // 鍋囪Type鏄瓨鍌ㄥ湪Map涓殑涓�涓敭 + task.setId((int) storageTaskMap.get("id")); + storageTaskService.taskUpdate(task); + return Result.success(); + } + + } \ No newline at end of file -- Gitblit v1.8.0