From 51e9b24c421dd2e77ec5809a62c35fec115d5876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:12:02 +0800
Subject: [PATCH] #添加 1. 添加库位逻辑分区 2. 物料添加自动生成编码 3. 库区字段显示优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index 26d45fe..3af7f58 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -5,6 +5,7 @@
import com.vincent.rsf.common.utils.Utils;
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.domain.PageResult;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -59,10 +60,27 @@
@OperationLog("Create 鐗╂枡鍒嗙被琛�")
@PostMapping("/matnrGroup/save")
public R save(@RequestBody MatnrGroup matnrGroup) {
+ if (Objects.isNull(matnrGroup)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnrGroup.getName())) {
+ throw new CoolException("鍒嗙粍鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnrGroup.getCode())) {
+ throw new CoolException("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
matnrGroup.setCreateBy(getLoginUserId());
- matnrGroup.setCreateTime(new Date());
matnrGroup.setUpdateBy(getLoginUserId());
- matnrGroup.setUpdateTime(new Date());
+ List<MatnrGroup> list = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .eq(MatnrGroup::getCode, matnrGroup.getCode()));
+ if (!list.isEmpty()) {
+ throw new CoolException("鐗╂枡鍒嗙粍缂栫爜涓嶈兘閲嶅锛侊紒");
+ }
+ List<MatnrGroup> groups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .eq(MatnrGroup::getName, matnrGroup.getName()));
+ if (!groups.isEmpty()) {
+ throw new CoolException("鍒嗙粍宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
+ }
if (!matnrGroupService.save(matnrGroup)) {
return R.error("Save Fail");
}
@@ -107,7 +125,7 @@
@PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@PostMapping("/matnrGroup/tree")
- public R tree(@RequestBody Map<String, Object> map) {
+ public R tree(@RequestBody(required = false) Map<String, Object> map) {
List<MatnrGroup> matnrs = new ArrayList<>();
if (Objects.isNull(map)) {
matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
--
Gitblit v1.9.1