From 5bf1406ed9e17b42ff04052667dcf288fa3a2ec0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 17:32:38 +0800
Subject: [PATCH] #新增 新增组拖任务生成
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index b1175b6..9bc3c5d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -4,6 +4,7 @@
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.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -11,6 +12,7 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.WaitPakin;
+import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -29,6 +31,9 @@
@Autowired
private WaitPakinService waitPakinService;
+
+ @Autowired
+ private TaskService taskService;
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/page")
@@ -61,9 +66,14 @@
@PostMapping("/waitPakin/save")
public R save(@RequestBody WaitPakin waitPakin) {
waitPakin.setCreateBy(getLoginUserId());
- waitPakin.setCreateTime(new Date());
waitPakin.setUpdateBy(getLoginUserId());
- waitPakin.setUpdateTime(new Date());
+ if (Objects.isNull(waitPakin.getBarcode()) || StringUtils.isBlank(waitPakin.getBarcode())) {
+ return R.error("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ List<WaitPakin> list = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
+ if (!list.isEmpty()) {
+ return R.error("鎷栫洏宸茬粍鎷栵紒锛�");
+ }
if (!waitPakinService.save(waitPakin)) {
return R.error("Save Fail");
}
@@ -113,4 +123,14 @@
}
+ @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+ @ApiOperation("鐢熸垚浠诲姟鍒楄〃")
+ @PostMapping("/waitPakin/merge")
+ public R generateTask(@RequestBody List<WaitPakin> waitPakin) {
+ if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return taskService.generateTasks(waitPakin);
+ }
+
}
--
Gitblit v1.9.1