From ef69d3bad0c7f03da11cb1c1e46a84bcebe02bc4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 10:44:48 +0800
Subject: [PATCH] 修改 # 物料分组编码规则优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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 e23db73..79b7975 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
@@ -28,6 +28,7 @@
@Autowired
private WarehouseAreasService warehouseAreasService;
+ @Autowired
private LocService locService;
@PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
@@ -60,6 +61,25 @@
@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.setUpdateBy(getLoginUserId());
if (!warehouseAreasService.save(warehouseAreas)) {
@@ -73,7 +93,23 @@
@PostMapping("/warehouseAreas/update")
public R update(@RequestBody WarehouseAreas warehouseAreas) {
warehouseAreas.setUpdateBy(getLoginUserId());
- warehouseAreas.setUpdateTime(new Date());
+ WarehouseAreas areas = warehouseAreasService.getById(warehouseAreas.getWarehouseId());
+ 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");
}
--
Gitblit v1.9.1