From 8d2e27d818b1e77e146d90e0d26c93d542b681e0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 15:28:57 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 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 0769ded..8e088f9 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,13 +4,20 @@
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;
import com.vincent.rsf.server.common.domain.KeyValVo;
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.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.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -18,10 +25,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
@@ -29,6 +38,14 @@
@Autowired
private WaitPakinService waitPakinService;
+
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskItemService taskItemService;
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/page")
@@ -61,9 +78,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");
}
@@ -85,11 +107,12 @@
@PreAuthorize("hasAuthority('manager:waitPakin:remove')")
@OperationLog("Delete 缁勬嫋妗�")
@PostMapping("/waitPakin/remove/{ids}")
+ @Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
- if (!waitPakinService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ if (Arrays.asList(ids).isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("Delete Success").add(ids);
+ return waitPakinService.removePakin(Arrays.asList(ids));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@@ -114,20 +137,16 @@
@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 GenerateTaskParams taskParams) {
+ if (Objects.isNull(taskParams)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (StringUtils.isBlank(waitPakin.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ if (Objects.isNull(taskParams.getWaitPakins()) || taskParams.getWaitPakins().isEmpty()) {
+ throw new CoolException("缁勬嫋妗ｄ笉鑳戒负绌猴紒锛�");
}
- if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
- return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
- }
- return R.ok(waitPakinService.mergeItems(waitPakin));
+ return taskService.generateTasks(taskParams, getLoginUserId());
}
-
}
--
Gitblit v1.9.1