From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 ceea18d..7f14c47 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
@@ -12,13 +12,11 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
+import com.vincent.rsf.server.manager.entity.BasStation;
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;
+import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -41,6 +39,9 @@
@Autowired
private WaitPakinItemService waitPakinItemService;
+
+ @Autowired
+ private BasStationService basStationService;
@Autowired
private TaskService taskService;
@@ -109,22 +110,21 @@
@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()) {
- 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 (Arrays.asList(ids).isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ for (Long id : ids) {
+ WaitPakin waitPakin = waitPakinService.getById(id);
+ BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getBarcode, waitPakin.getBarcode())
+ ,false
+ );
+ if (!Cools.isEmpty(isBarcodeSta)){
+ throw new CoolException("璇ユ潯鐮佸凡琚�"+isBarcodeSta.getStationName()+"绔欑粦瀹�");
}
}
- 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);
+
+ return waitPakinService.removePakin(Arrays.asList(ids));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
--
Gitblit v1.9.1