From 2938aa734a2cf0baf93fdced92ea21e37f187365 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:05:39 +0800
Subject: [PATCH] 出库单下发执行生成任务明细
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 59adfb7..108539b 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,12 +5,15 @@
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.service.LocItemService;
import com.vincent.rsf.server.manager.service.LocService;
@@ -82,17 +85,25 @@
/**
* 鐢熸垚搴撳瓨鍑哄簱浠诲姟
- * @param map
+ * @param param
* @return
*/
@PreAuthorize("hasAuthority('manager:locItem:list')")
@ApiOperation("鐢熸垚搴撳瓨鍑哄簱浠诲姟")
@PostMapping("/locItem/generate/task")
- public R generateTask(@RequestBody Map<String, Object> map) {
- if (Objects.isNull(map)) {
+ public R generateTask(@RequestBody LocToTaskParams param) {
+ if (Objects.isNull(param)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return locItemService.generateTask(map);
+ param.setType(Constants.TASK_TYPE_OUT_STOCK);
+
+ try {
+ locItemService.generateTask(param, getLoginUserId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return R.ok();
}
/**
@@ -103,11 +114,11 @@
@PreAuthorize("hasAuthority('manager:locItem:list')")
@ApiOperation("鐢熸垚绉诲簱浠诲姟")
@PostMapping("/locItem/move/task")
- public R genMoveTask(@RequestBody Map<String, Object> map) {
+ public R genMoveTask(@RequestBody LocToTaskParams map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return locItemService.genMoveTask(map);
+ return R.ok("浠诲姟鐢熸垚鎴愬姛").add(locItemService.genMoveTask(map, getLoginUserId()));
}
/**
@@ -118,11 +129,19 @@
@PreAuthorize("hasAuthority('manager:locItem:list')")
@ApiOperation("鐢熸垚鐩樼偣鍑哄簱浠诲姟")
@PostMapping("/locItem/check/task")
- public R genStatisticalTask(@RequestBody Map<String, Object> map) {
+ public R genStatisticalTask(@RequestBody LocToTaskParams map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return locItemService.generateTask(map);
+ map.setType(Constants.TASK_TYPE_OUT_CHECK);
+
+ try {
+ locItemService.generateTask(map, getLoginUserId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return R.ok("浠诲姟鐢熸垚鎴愬姛");
}
--
Gitblit v1.9.1