From fac10dcb68a892be100960e267d0a1501f34e984 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 10:28:06 +0800
Subject: [PATCH] #修改 基础数据添加空管字段
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 11 +++++++++--
1 files changed, 9 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..e23db73 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,8 @@
@Autowired
private WarehouseAreasService warehouseAreasService;
+
+ private LocService locService;
@PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
@PostMapping("/warehouseAreas/page")
@@ -56,9 +61,7 @@
@PostMapping("/warehouseAreas/save")
public R save(@RequestBody WarehouseAreas warehouseAreas) {
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 +84,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