zhou zhou
2 天以前 a8df4c4a80781c02815021a840971ce4b15419f5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
@@ -22,7 +23,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -39,7 +40,9 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        baseParam.setOrderBy("code asc");
        PageParam<MatnrGroup, BaseParam> pageParam = new PageParam<>(baseParam, MatnrGroup.class);
        return R.ok().add(matnrGroupService.page(pageParam, pageParam.buildWrapper(true)));
        PageParam<MatnrGroup, BaseParam> page = matnrGroupService.page(pageParam, pageParam.buildWrapper(true));
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
    }
    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@@ -65,13 +68,14 @@
    @PostMapping("/matnrGroup/save")
    public R save(@RequestBody MatnrGroup matnrGroup) {
        if (Objects.isNull(matnrGroup)) {
            throw new CoolException("参数不能为空!!");
            return R.error("参数不能为空!!");
        }
        if (Objects.isNull(matnrGroup.getName())) {
            throw new CoolException("分组名称不能为空!!");
            return R.error("分组名称不能为空!!");
        }
        if (Objects.isNull(matnrGroup.getCode())) {
            throw new CoolException("分组编码不能为空!!");
            return R.error("分组编码不能为空!!");
        }
        matnrGroup.setCreateBy(getLoginUserId());
        matnrGroup.setUpdateBy(getLoginUserId());
@@ -80,12 +84,12 @@
                .eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
                .eq(MatnrGroup::getCode, matnrGroup.getCode()));
        if (!list.isEmpty()) {
            throw new CoolException("物料分组编码不能重复!!");
            return R.error("物料分组编码不能重复!!");
        }
        List<MatnrGroup> groups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                .eq(MatnrGroup::getName, matnrGroup.getName()));
        if (!groups.isEmpty()) {
            throw new CoolException("分组已存在,请勿重复添加!!");
            return R.error("分组已存在,请勿重复添加!!");
        }
        //判断上级编码是否为空
        if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
@@ -104,10 +108,13 @@
        matnrGroup.setUpdateBy(getLoginUserId());
        MatnrGroup matGroup = matnrGroupService.getById(matnrGroup.getId());
        if (Objects.isNull(matGroup)) {
            return R.error("物料分组不存在!!");
        }
        if (!matnrGroup.getName().equals(matGroup.getName())) {
            List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnrGroup.getName()));
            if (!areasList.isEmpty()) {
                throw new CoolException("仓库名已存在!!");
                return R.error("仓库名已存在!!");
            }
        }
        if (!Objects.isNull(matnrGroup.getCode()) && !matnrGroup.getCode().equals(matGroup.getCode())) {
@@ -115,13 +122,8 @@
                            .eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
                    .eq(MatnrGroup::getCode, matnrGroup.getCode()));
            if (!areasList.isEmpty()) {
                throw new CoolException("仓库编码已存在!!");
                return R.error("仓库编码已存在!!");
            }
        }
            //判断上级编码是否为空
        if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
            matnrGroup.setCode(matnrGroup.getParCode() + matnrGroup.getCode());
        }
        if (!matnrGroupService.updateById(matnrGroup)) {