From ef68e47e7a9f07ad84075504ff3cc8654c299ce7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 15:52:48 +0800
Subject: [PATCH] #修改 物料修改扩展字段优化
---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java | 4 +++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 7 ++++---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 17 +++++++++++++++++
4 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
index d3cfffb..8a6897f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -117,7 +117,9 @@
}
}
}
-
+ } else {
+ String uuid16 = CommonUtil.randomUUID16();
+ saveFields(params, uuid16);
}
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index c992c2d..c3d426d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -47,7 +47,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
- return R.ok().add( matnrService.getMatnrPage(pageParam));
+ return R.ok().add(matnrService.getMatnrPage(pageParam));
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@@ -76,7 +76,7 @@
if (Objects.isNull(matnr)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(matnr.get("matnr"))) {
+ if (Objects.isNull(matnr.get("name"))) {
throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(matnr.get("groupId"))) {
@@ -124,9 +124,10 @@
if (!matnrService.updateById(matnr)) {
return R.error("Update Fail");
}
- if (!Objects.isNull(params.get("fieldsIndex"))) {
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
FieldsUtils.updateFieldsValue(params);
}
+
return R.ok("Update Success").add(matnr);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
index 03e2193..418763b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -73,6 +73,14 @@
if (Objects.isNull(warehouse.getName())) {
throw new CoolException("浠撳簱鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
+ List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName()));
+ if (!warehouses.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶇О宸插瓨鍦紒锛�");
+ }
+ if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+
warehouse.setCreateBy(getLoginUserId());
warehouse.setUpdateBy(getLoginUserId());
if (!warehouseService.save(warehouse)) {
@@ -92,6 +100,15 @@
throw new CoolException("浠撳簱鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
warehouse.setUpdateBy(getLoginUserId());
+
+ List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName()));
+ if (!warehouses.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶇О宸插瓨鍦紒锛�");
+ }
+ if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+
if (!warehouseService.updateById(warehouse)) {
return R.error("Update Fail");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 3e801f0..8593a26 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -280,7 +280,7 @@
// null // 澶囨敞
// );
- public String getTypeId$(){
+ public String getTypeIds$(){
if (null == this.type){ return null; }
String[] split = this.type.split(",");
List<String> asList = Arrays.asList(split);
--
Gitblit v1.9.1