From b7b3328fdfa45cf13d1943fa79d47f1b6bb43f01 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 18:22:17 +0800
Subject: [PATCH] 添加定时任务用户

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
index e06bb8b..612bce4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
@@ -5,17 +5,21 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.utils.LocUtils;
+import com.vincent.rsf.server.common.constant.Constants;
 import com.vincent.rsf.server.common.utils.ExcelUtil;
 import com.vincent.rsf.server.common.annotation.OperationLog;
 import com.vincent.rsf.server.common.domain.BaseParam;
 import com.vincent.rsf.server.common.domain.KeyValVo;
 import com.vincent.rsf.server.common.domain.PageParam;
 import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
 import com.vincent.rsf.server.manager.entity.LocItem;
-import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
 import com.vincent.rsf.server.manager.service.LocItemService;
+import com.vincent.rsf.server.manager.service.LocService;
 import com.vincent.rsf.server.system.controller.BaseController;
-import com.vincent.rsf.server.system.enums.LocStsType;
+import com.vincent.rsf.server.manager.enums.LocStsType;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -28,6 +32,8 @@
 
     @Autowired
     private LocItemService locItemService;
+    @Autowired
+    private LocService locService;
 
     @PreAuthorize("hasAuthority('manager:locItem:list')")
     @PostMapping("/locItem/page")
@@ -77,14 +83,55 @@
         return R.ok().add(page);
     }
 
+    /**
+     * 鐢熸垚搴撳瓨鍑哄簱浠诲姟
+     * @param param
+     * @return
+     */
     @PreAuthorize("hasAuthority('manager:locItem:list')")
+    @ApiOperation("鐢熸垚搴撳瓨鍑哄簱浠诲姟")
     @PostMapping("/locItem/generate/task")
-    public R generateTask(@RequestBody Map<String, Object> map) {
+    public R generateTask(@RequestBody LocToTaskParams param) {
+        if (Objects.isNull(param)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        param.setType(Constants.TASK_TYPE_OUT_STOCK);
+
+        return locItemService.generateTask(param, getLoginUserId());
+    }
+
+    /**
+     * 鐢熸垚绉诲簱浠诲姟
+     * @param map
+     * @return
+     */
+    @PreAuthorize("hasAuthority('manager:locItem:list')")
+    @ApiOperation("鐢熸垚绉诲簱浠诲姟")
+    @PostMapping("/locItem/move/task")
+    public R genMoveTask(@RequestBody LocToTaskParams map) {
         if (Objects.isNull(map)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        return locItemService.generateTask(map);
+        return R.ok("浠诲姟鐢熸垚鎴愬姛").add(locItemService.genMoveTask(map, getLoginUserId()));
     }
+
+    /**
+     * 鐢熸垚鐩樼偣鍑哄簱浠诲姟
+     * @param map
+     * @return
+     */
+    @PreAuthorize("hasAuthority('manager:locItem:list')")
+    @ApiOperation("鐢熸垚鐩樼偣鍑哄簱浠诲姟")
+    @PostMapping("/locItem/check/task")
+    public R genStatisticalTask(@RequestBody LocToTaskParams map) {
+        if (Objects.isNull(map)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        map.setType(Constants.TASK_TYPE_OUT_CHECK);
+
+        return R.ok("浠诲姟鐢熸垚鎴愬姛").add(locItemService.generateTask(map, getLoginUserId()));
+    }
+
 
     @PreAuthorize("hasAuthority('manager:locItem:list')")
     @PostMapping("/locItem/list")
@@ -101,7 +148,7 @@
     @PreAuthorize("hasAuthority('manager:locItem:list')")
     @GetMapping("/locItem/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(locItemService.getById(id));
+        return R.ok().add(locService.getById(id));
     }
 
     @PreAuthorize("hasAuthority('manager:locItem:save')")

--
Gitblit v1.9.1