From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +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/ContainerController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java
index 4c3aff9..d8ccf27 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.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;
@@ -56,9 +57,13 @@
@PostMapping("/container/save")
public R save(@RequestBody Container container) {
container.setCreateBy(getLoginUserId());
- container.setCreateTime(new Date());
container.setUpdateBy(getLoginUserId());
- container.setUpdateTime(new Date());
+ if (Objects.isNull(container.getType())) {
+ throw new CoolException("瀹瑰櫒绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(container.getUsed())) {
+ throw new CoolException("瀹瑰櫒浣跨敤娆℃暟涓嶈兘涓虹┖锛侊紒");
+ }
if (!containerService.save(container)) {
return R.error("Save Fail");
}
@@ -81,6 +86,10 @@
@OperationLog("Delete 搴撲綅淇℃伅琛�")
@PostMapping("/container/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ List<Container> containers = containerService.list(new LambdaQueryWrapper<Container>().in(Container::getPanrentId, ids));
+ if (containers.isEmpty()) {
+ throw new CoolException("褰撳墠瀹瑰櫒鏈夊瓙瀹瑰櫒缁戝畾锛屼笉鑳芥墽琛屽垹闄ゆ搷浣滐紒锛�");
+ }
if (!containerService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
@@ -104,7 +113,13 @@
@PreAuthorize("hasAuthority('manager:container:list')")
@PostMapping("/container/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(containerService.list(), Container.class), response);
+ List<Container> containers = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ containers = containerService.list(new LambdaQueryWrapper<Container>().in(Container::getId, map.get("ids")));
+ } else {
+ containers = containerService.list();
+ }
+ ExcelUtil.build(ExcelUtil.create(containers, Container.class), response);
}
}
--
Gitblit v1.9.1