From 4b5d1e73dc796054194691580c86733a2664508c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:08:17 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
index 817e9a6..ccb02ff 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
@@ -4,12 +4,15 @@
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.entity.Loc;
import com.vincent.rsf.server.manager.entity.WarehouseAreas;
+import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +27,9 @@
@Autowired
private WarehouseAreasService warehouseAreasService;
+
+ @Autowired
+ private LocService locService;
@PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
@PostMapping("/warehouseAreas/page")
@@ -55,10 +61,27 @@
@OperationLog("Create 搴撳尯淇℃伅琛�")
@PostMapping("/warehouseAreas/save")
public R save(@RequestBody WarehouseAreas warehouseAreas) {
+
+ if (Objects.isNull(warehouseAreas)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(warehouseAreas.getName())) {
+ throw new CoolException("搴撳尯鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(warehouseAreas.getCode())) {
+ throw new CoolException("搴撳尯缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+
+ List<WarehouseAreas> list = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getName, warehouseAreas.getName()));
+ if (!list.isEmpty()) {
+ throw new CoolException("搴撳尯鍚嶇О宸插瓨鍦紒锛�");
+ }
+ if (!warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, warehouseAreas.getCode())).isEmpty()) {
+ throw new CoolException("搴撳尯缂栫爜宸插瓨鍦紒锛�");
+ }
+
warehouseAreas.setCreateBy(getLoginUserId());
- warehouseAreas.setCreateTime(new Date());
warehouseAreas.setUpdateBy(getLoginUserId());
- warehouseAreas.setUpdateTime(new Date());
if (!warehouseAreasService.save(warehouseAreas)) {
return R.error("Save Fail");
}
@@ -81,6 +104,10 @@
@OperationLog("Delete 搴撳尯淇℃伅琛�")
@PostMapping("/warehouseAreas/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().in(Loc::getAreaId, ids));
+ if (!locs.isEmpty()) {
+ throw new CoolException("褰撳墠搴撴湁搴撲綅缁戝畾锛屼笉鑳芥墽琛屽垹闄ゆ搷浣滐紒锛�");
+ }
if (!warehouseAreasService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
--
Gitblit v1.9.1