From ca23f2be97249ab82494983ee34636dcc28c8a19 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 四月 2025 10:13:52 +0800
Subject: [PATCH] 报检提示优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 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 385b535..0c29bfe 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,9 @@
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.entity.WaitPakinItem;
+import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -29,6 +33,12 @@
@Autowired
private WaitPakinService waitPakinService;
+
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+
+ @Autowired
+ private TaskService taskService;
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/page")
@@ -61,9 +71,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");
}
@@ -86,6 +101,11 @@
@OperationLog("Delete 缁勬嫋妗�")
@PostMapping("/waitPakin/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
+ .in(WaitPakinItem::getPakinId, ids));
+ if (!pakinItems.isEmpty()) {
+ return R.error("缁勬嫋妗ｆ湁鏄庣粏浠诲姟");
+ }
if (!waitPakinService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
@@ -114,36 +134,13 @@
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
- @ApiOperation("缁勬嫋")
+ @ApiOperation("鐢熸垚浠诲姟鍒楄〃")
@PostMapping("/waitPakin/merge")
- public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
- if (Objects.isNull(waitPakin)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ public R generateTask(@RequestBody List<WaitPakin> waitPakin) {
+ if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (StringUtils.isBlank(waitPakin.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
- return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
- }
- return R.ok(waitPakinService.mergeItems(waitPakin));
- }
-
- @PreAuthorize("hasAuthority('manager:waitPakin:update')")
- @ApiOperation("缁勬嫋瑙ｇ粦")
- @PostMapping("/waitPakin/unbind")
- public R pakinUnBind(@RequestBody WaitPakinParam param) {
- if (Objects.isNull(param)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- if (StringUtils.isBlank(param.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
- return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
- }
- return R.ok(waitPakinService);
-
+ return taskService.generateTasks(waitPakin, getLoginUserId());
}
}
--
Gitblit v1.9.1