From 99f5c058c42521640d815f3d52dc722a5d5ad4c4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 18:59:43 +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/LocItemController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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..5f8890f 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
@@ -12,10 +12,9 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
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.system.controller.BaseController;
-import com.vincent.rsf.server.system.enums.LocStsType;
+import com.vincent.rsf.server.manager.enums.LocStsType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -77,6 +76,11 @@
return R.ok().add(page);
}
+ /**
+ * 鐢熸垚搴撳瓨鍑哄簱浠诲姟
+ * @param map
+ * @return
+ */
@PreAuthorize("hasAuthority('manager:locItem:list')")
@PostMapping("/locItem/generate/task")
public R generateTask(@RequestBody Map<String, Object> map) {
@@ -86,6 +90,35 @@
return locItemService.generateTask(map);
}
+ /**
+ * 鐢熸垚绉诲簱浠诲姟
+ * @param map
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:locItem:list')")
+ @PostMapping("/locItem/generate/move/task")
+ public R genMoveTask(@RequestBody Map<String, Object> map) {
+ if (Objects.isNull(map)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return locItemService.genMoveTask(map);
+ }
+
+ /**
+ * 鐢熸垚鐩樼偣鍑哄簱浠诲姟
+ * @param map
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:locItem:list')")
+ @PostMapping("/locItem/check/task")
+ public R genStatisticalTask(@RequestBody Map<String, Object> map) {
+ if (Objects.isNull(map)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return locItemService.generateTask(map);
+ }
+
+
@PreAuthorize("hasAuthority('manager:locItem:list')")
@PostMapping("/locItem/list")
public R list(@RequestBody Map<String, Object> map) {
--
Gitblit v1.9.1