From 5edad169a59ef92008c0d7896bd773a4230bf580 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 10:53:29 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index b3710c4..11a8dc0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -128,16 +129,46 @@
ExcelUtil.build(ExcelUtil.create(taskService.list(), Task.class), response);
}
-
@PreAuthorize("hasAuthority('manager:task:update')")
@ApiOperation("瀹屾垚浠诲姟")
- @GetMapping("/task/complete/{id}")
+ @PostMapping("/task/complete/{id}")
public R completeTask(@PathVariable String id) {
if (Objects.isNull(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-// return taskService.completeTask(id);
- return null;
+ List<Long> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
+ if (tasks.isEmpty()) {
+ throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿畬鎴愶紒锛�");
+ }
+ try {
+ taskService.completeTask(tasks);
+ } catch (Exception ex) {
+ return R.error("浠诲姟寮傚父锛屾棤娉曞畬鎴愶紒锛�");
+ }
+ return R.ok();
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("浠诲姟鍑哄簱缃《")
+ @PostMapping("/task/top/{id}")
+ public R setTop(@PathVariable String id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ List<Long> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
+ if (tasks.isEmpty()) {
+ throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
+ }
+ try {
+ if (!taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getSort, 100).eq(Task::getId, id))) {
+ throw new CoolException("缃《澶辫触锛侊紒");
+ }
+ } catch (Exception ex) {
+ return R.error("浠诲姟寮傚父锛屾棤娉曞畬鎴愶紒锛�");
+ }
+ return R.ok();
}
--
Gitblit v1.9.1