From 2799c6690aff9c1577ba4dc290dc56a28767a769 Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期六, 19 四月 2025 15:03:43 +0800
Subject: [PATCH] #修改 1. 采购单界面优化及修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 5 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 83b4c3c..3884999 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,14 +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.WarehouseAreaParam;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,11 +25,15 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "浠撳簱搴撳尯")
@RestController
public class WarehouseAreasController extends BaseController {
@Autowired
private WarehouseAreasService warehouseAreasService;
+
+ @Autowired
+ private LocService locService;
@PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
@PostMapping("/warehouseAreas/page")
@@ -55,10 +65,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");
}
@@ -66,11 +93,45 @@
}
@PreAuthorize("hasAuthority('manager:warehouseAreas:update')")
+ @ApiOperation("搴撳尯鎵归噺淇敼")
+ @PostMapping("/warehouseAreas/batch/update")
+ public R batchUpdate(@RequestBody WarehouseAreaParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getIds()) && params.getIds().isEmpty()) {
+ return R.error("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
+ }
+ if (warehouseAreasService.batchUpdate(params, getLoginUserId())) {
+ return R.ok("淇敼鎴愬姛锛侊紒");
+ } else {
+ return R.error("淇敼澶辫触锛侊紒");
+ }
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:update')")
@OperationLog("Update 搴撳尯淇℃伅琛�")
@PostMapping("/warehouseAreas/update")
public R update(@RequestBody WarehouseAreas warehouseAreas) {
warehouseAreas.setUpdateBy(getLoginUserId());
- warehouseAreas.setUpdateTime(new Date());
+ WarehouseAreas areas = warehouseAreasService.getById(warehouseAreas.getId());
+ if (Objects.isNull(areas)) {
+ throw new CoolException("鏁版嵁閿欒锛氫粨搴撳簱鍖轰笉瀛樺湪锛侊紒");
+ }
+ if (!warehouseAreas.getName().equals(areas.getName())) {
+ List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getName, warehouseAreas.getName()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("鍚嶇О宸插瓨鍦紒锛�");
+ }
+ }
+ if (!warehouseAreas.getCode().equals(areas.getCode())) {
+ List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, warehouseAreas.getCode()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("缂栫爜宸插瓨鍦紒锛�");
+ }
+ }
+
if (!warehouseAreasService.updateById(warehouseAreas)) {
return R.error("Update Fail");
}
@@ -81,6 +142,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");
}
@@ -93,10 +158,10 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<WarehouseAreas> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(WarehouseAreas::getUuid, condition);
+ wrapper.like(WarehouseAreas::getType, condition);
}
warehouseAreasService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getUuid()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getType()))
);
return R.ok().add(vos);
}
--
Gitblit v1.9.1