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/MatnrGroupController.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 2b745ee..90d9286 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
@@ -17,6 +17,7 @@
 import com.vincent.rsf.server.manager.service.MatnrGroupService;
 import com.vincent.rsf.server.system.controller.BaseController;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -72,8 +73,12 @@
         if (Objects.isNull(matnrGroup.getCode())) {
             throw new CoolException("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
         }
+        if (Objects.isNull(matnrGroup.getParCode())) {
+            throw new CoolException("涓婄骇缂栫爜涓嶈兘涓虹┖锛�!");
+        }
         matnrGroup.setCreateBy(getLoginUserId());
         matnrGroup.setUpdateBy(getLoginUserId());
+
         List<MatnrGroup> list = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                 .eq(MatnrGroup::getCode, matnrGroup.getCode()));
         if (!list.isEmpty()) {
@@ -83,6 +88,10 @@
                 .eq(MatnrGroup::getName, matnrGroup.getName()));
         if (!groups.isEmpty()) {
             throw new CoolException("鍒嗙粍宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
+        }
+        //鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
+        if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
+            matnrGroup.setParCode(matnrGroup.getParCode() + matnrGroup.getCode());
         }
         if (!matnrGroupService.save(matnrGroup)) {
             return R.error("Save Fail");
@@ -109,6 +118,11 @@
             }
         }
 
+        //鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
+        if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
+            matnrGroup.setCode(matnrGroup.getParCode() + matnrGroup.getCode());
+        }
+
         if (!matnrGroupService.updateById(matnrGroup)) {
             return R.error("Update Fail");
         }

--
Gitblit v1.9.1