From bc25523bd723e92e85f3463edca27f0fe18a7a71 Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期日, 13 四月 2025 16:49:19 +0800
Subject: [PATCH] #修改 收货单据界面优化修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 0c29bfe..4a674b5 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
@@ -11,8 +11,10 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
+import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
@@ -22,10 +24,12 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@Api(tags = "缁勬嫋閫氱煡妗�")
@RestController
@@ -39,6 +43,8 @@
@Autowired
private TaskService taskService;
+ @Autowired
+ private TaskItemService taskItemService;
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/page")
@@ -100,15 +106,23 @@
@PreAuthorize("hasAuthority('manager:waitPakin:remove')")
@OperationLog("Delete 缁勬嫋妗�")
@PostMapping("/waitPakin/remove/{ids}")
+ @Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
.in(WaitPakinItem::getPakinId, ids));
if (!pakinItems.isEmpty()) {
- return R.error("缁勬嫋妗ｆ湁鏄庣粏浠诲姟");
+ List<Long> list = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSource, list));
+ if (!taskItems.isEmpty()) {
+ return R.error("缁勬嫋妗ｆ湁鏄庣粏浠诲姟");
+ }
}
if (!waitPakinService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
+ if (!waitPakinItemService.removeByIds(pakinItems)) {
+ throw new CoolException("鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
return R.ok("Delete Success").add(ids);
}
--
Gitblit v1.9.1