From 7a717a0bbc0eac8e494cd84207482e983ef56a3c Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期日, 08 二月 2026 17:42:55 +0800
Subject: [PATCH] RCS入库流程优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 aa3c856..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')")
@@ -142,6 +131,15 @@
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()));
+ }
/**
* 鎷ｆ枡鍑哄簱锛堢敤浜庢祴璇曟嫞鏂欏嚭搴擄級
@@ -161,6 +159,16 @@
}
}
+ @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));
+ }
+
/**
* 鐩樼偣鍑哄簱锛堢敤浜庢祴璇曠洏鐐瑰嚭搴擄級
*
--
Gitblit v1.9.1