From 75f1980c5e915635cfbf403485c1778e5a583c98 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 03 七月 2025 13:54:27 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
index 14d46fe..bb74603 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -13,10 +14,17 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.vincent.rsf.server.manager.entity.TaskItemLog;
import com.vincent.rsf.server.manager.entity.Wave;
import com.vincent.rsf.server.manager.entity.WaveItem;
+import com.vincent.rsf.server.manager.enums.WaveExceStatus;
+import com.vincent.rsf.server.manager.enums.WaveItemExceStatus;
+import com.vincent.rsf.server.manager.service.OutStockService;
+import com.vincent.rsf.server.manager.service.TaskItemLogService;
import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.WaveService;
+import com.vincent.rsf.server.manager.service.impl.TaskItemLogServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.WaveItemServiceImpl;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@@ -34,6 +42,12 @@
private WaveService waveService;
@Autowired
private TaskItemService taskItemService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private TaskItemLogService taskItemLogService;
+ @Autowired
+ private WaveItemServiceImpl waveItemService;
@PreAuthorize("hasAuthority('manager:wave:list')")
@PostMapping("/wave/page")
@@ -134,7 +148,7 @@
@ApiOperation("閫夋嫨鏄庣粏涓嬪彂浠诲姟")
@PostMapping("/wave/selects/task")
public R waveToTask(@RequestBody Map<String, Object> map) {
- if (Cools.isEmpty(map) || Cools.isEmpty(map.get("wave"))) {
+ if (Cools.isEmpty(map) || Cools.isEmpty(map.get("ids"))) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return waveService.waveToTask(map, getLoginUserId());
@@ -154,4 +168,39 @@
return R.ok().add(pageResult);
}
+ @PreAuthorize("hasAuthority('manager:waveItem:update')")
+ @ApiOperation("鏆傚仠涓嬪彂浠诲姟")
+ @PostMapping("/wave/pause/pub/{id}")
+ public R pausePublicTask(@PathVariable Long id) {
+ waveService.update(new LambdaUpdateWrapper<Wave>()
+ .eq(Wave::getId, id)
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_PAUSE.val));
+ return R.ok();
+ }
+
+ @PreAuthorize("hasAuthority('manager:waveItem:update')")
+ @ApiOperation("缁х画涓嬪彂浠诲姟")
+ @PostMapping("/wave/continue/pub/{id}")
+ public R continuePublicTask(@PathVariable Long id) {
+ waveService.update(new LambdaUpdateWrapper<Wave>()
+ .eq(Wave::getId, id)
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val));
+ return R.ok();
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:waveItem:update')")
+ @ApiOperation("缁堟涓嬪彂浠诲姟")
+ @PostMapping("/wave/stop/pub/{id}")
+ public R stopPublicTask(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ waveService.update(new LambdaUpdateWrapper<Wave>()
+ .eq(Wave::getId, id)
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_PAUSE.val));
+
+ return waveService.stopPubTask(id);
+ }
+
}
--
Gitblit v1.9.1