From 50f2f8945f1ab86c931fee6cf9d9bd88a122ae6e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 07 六月 2025 17:14:47 +0800
Subject: [PATCH] #单据出库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 76 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 31 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 d82bcf5..b7ca780 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
@@ -1,11 +1,13 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.framework.exception.CoolException;
+import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -14,10 +16,12 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;
import com.vincent.rsf.server.system.controller.BaseController;
-import com.vincent.rsf.server.system.enums.LocStsType;
+import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +33,8 @@
@RestController
public class TaskController extends BaseController {
+ public static final Logger logger = LoggerFactory.getLogger(TaskController.class);
+
@Autowired
private TaskService taskService;
@Autowired
@@ -37,6 +43,8 @@
private WaitPakinService waitPakinService;
@Autowired
private LocService locService;
+ @Autowired
+ private ConfigServiceImpl configService;
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -44,7 +52,8 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
- return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true);
+ return R.ok().add(taskService.page(pageParam, queryWrapper));
}
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -92,14 +101,14 @@
}
@PreAuthorize("hasAuthority('manager:task:remove')")
- @OperationLog("Delete 浠诲姟宸ヤ綔妗�")
+ @OperationLog("鍙栨秷/鍒犻櫎宸ヤ綔鏋佹。")
+ @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);
+ return taskService.removeTask(ids, getLoginUserId());
// return R.ok("Delete Success").add(ids);
}
@@ -126,24 +135,16 @@
@PreAuthorize("hasAuthority('manager:task:update')")
@ApiOperation("瀹屾垚浠诲姟")
@PostMapping("/task/complete/{id}")
- public R completeTask(@PathVariable String id) throws Exception {
- if (Objects.isNull(id)) {
+ public R completeTask(@PathVariable Long id) throws Exception {
+ if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
- for (Task task : tasks) {
- task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
- }
- if (!taskService.updateBatchById(tasks)) {
- return R.error("瀹屾垚浠诲姟澶辫触");
- }
-
- return R.ok("瀹屾垚浠诲姟鎴愬姛");
+ return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id, getLoginUserId()));
}
+
/**
- * 鎷ｆ枡鍑哄簱
+ * 鎷ｆ枡鍑哄簱锛堢敤浜庢祴璇曟嫞鏂欏嚭搴擄級
* @return
*/
@PreAuthorize("hasAuthority('manager:task:update')")
@@ -154,7 +155,26 @@
throw new CoolException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
}
try {
- return taskService.pickTask(id);
+ return R.ok("鍑哄簱瀹屾垚").add(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_PICK));
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鐩樼偣鍑哄簱锛堢敤浜庢祴璇曠洏鐐瑰嚭搴擄級
+ *
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鐩樼偣鍑哄簱")
+ @PostMapping("/task/check/{id}")
+ public R checkTask(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
+ }
+ try {
+ return R.ok(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_CHECK));
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
@@ -173,21 +193,15 @@
@PreAuthorize("hasAuthority('manager:task:update')")
@ApiOperation("浠诲姟鍑哄簱缃《")
@PostMapping("/task/top/{id}")
- public R setTop(@PathVariable String id) {
+ public R setTop(@PathVariable Long id) {
if (Objects.isNull(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
- if (tasks.isEmpty()) {
- throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
- }
try {
- if (!taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getSort, 100).eq(Task::getId, id))) {
- throw new CoolException("缃《澶辫触锛侊紒");
- }
- } catch (Exception ex) {
- return R.error("浠诲姟寮傚父锛屾棤娉曞畬鎴愶紒锛�");
+ taskService.taskToTop(id, getLoginUserId());
+ } catch (Exception e) {
+ logger.error("UNK", e);
+ throw new CoolException(e.getMessage());
}
return R.ok();
}
--
Gitblit v1.9.1