From bb4f5dc6bbf43616ca3482257b576c9c66c49ff5 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 07 二月 2026 11:20:07 +0800
Subject: [PATCH] 全版出库增加完结按钮
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 24658cf..ea42f39 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
@@ -37,15 +37,6 @@
@Autowired
private TaskService taskService;
- @Autowired
- private TaskItemService taskItemService;
- @Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private LocService locService;
- @Autowired
- private ConfigServiceImpl configService;
-
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/task/page")
@@ -101,15 +92,13 @@
}
@PreAuthorize("hasAuthority('manager:task:remove')")
- @OperationLog("Delete 浠诲姟宸ヤ綔妗�")
+ @ApiOperation("鍙栨秷/鍒犻櫎宸ヤ綔鏋佹。")
@PostMapping("/task/remove/{ids}")
- @Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
if (Objects.isNull(ids) || ids.length < 1) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return taskService.removeTask(ids, getLoginUserId());
-// return R.ok("Delete Success").add(ids);
}
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -139,9 +128,18 @@
if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id));
+ return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id, getLoginUserId()));
}
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鍏ㄧ増鍑哄簱瀹岀粨")
+ @PostMapping("/task/complete/fullOutStock/{id}")
+ public R completeFullOutStock(@PathVariable Long id) throws Exception {
+ if (Cools.isEmpty(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok("鍏ㄧ増鍑哄簱瀹岀粨鎴愬姛").add(taskService.completeFullOutStock(id, getLoginUserId()));
+ }
/**
* 鎷ｆ枡鍑哄簱锛堢敤浜庢祴璇曟嫞鏂欏嚭搴擄級
@@ -159,6 +157,16 @@
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鎵嬪姩涓嬪彂鎵ц")
+ @PostMapping("/task/menual/exce/{ids}")
+ public R pubExce(@PathVariable Long[] ids) {
+ if (Objects.isNull(ids)) {
+ return R.error("鎵嬪姩涓嬪彂鎵ц锛�");
+ }
+ return taskService.menualExceTask(Arrays.asList(ids));
}
/**
@@ -198,7 +206,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
try {
- taskService.taskToTop(id);
+ taskService.taskToTop(id, getLoginUserId());
} catch (Exception e) {
logger.error("UNK", e);
throw new CoolException(e.getMessage());
--
Gitblit v1.9.1