From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 1456ea1..7e7ae8a 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
@@ -14,9 +14,8 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;
import com.vincent.rsf.server.system.controller.BaseController;
-import com.vincent.rsf.server.system.enums.LocStsType;
+import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +36,8 @@
private WaitPakinService waitPakinService;
@Autowired
private LocService locService;
+ @Autowired
+ private ConfigServiceImpl configService;
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -130,12 +131,9 @@
if (Objects.isNull(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Integer> 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("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿畬鎴愶紒锛�");
-// }
-// taskService.completeTask(tasks);
+
for (Task task : tasks) {
task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
}
@@ -144,6 +142,24 @@
}
return R.ok("瀹屾垚浠诲姟鎴愬姛");
+ }
+
+ /**
+ * 鎷ｆ枡鍑哄簱
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鎷ｆ枡鍑哄簱")
+ @PostMapping("/task/pick/{id}")
+ public R pickTask(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
+ }
+ try {
+ return R.ok(taskService.pickTask(id));
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
}
// @PreAuthorize("hasAuthority('manager:task:update')")
@@ -163,7 +179,7 @@
if (Objects.isNull(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Integer> 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("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
--
Gitblit v1.9.1