#修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复

skyouc

6 天以前 014270352f8e19b51bbb4367ae2ff256050a30a2

 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;
@@ -12,15 +13,18 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
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.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.*;

import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@Api(tags = "物料分组")
@RestController
@@ -33,6 +37,7 @@
    @PostMapping("/matnrGroup/page")
    public R page(@RequestBody Map<String, Object> map) {
        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)));
    }
@@ -59,10 +64,34 @@
    @OperationLog("Create 物料分类表")
    @PostMapping("/matnrGroup/save")
    public R save(@RequestBody MatnrGroup matnrGroup) {
        if (Objects.isNull(matnrGroup)) {
            return R.error("参数不能为空！！");
        }

        if (Objects.isNull(matnrGroup.getName())) {
            return R.error("分组名称不能为空！！");
        }
        if (Objects.isNull(matnrGroup.getCode())) {
            return R.error("分组编码不能为空！！");
        }
        matnrGroup.setCreateBy(getLoginUserId());
        matnrGroup.setCreateTime(new Date());
        matnrGroup.setUpdateBy(getLoginUserId());
        matnrGroup.setUpdateTime(new Date());

        List<MatnrGroup> list = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                .eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
                .eq(MatnrGroup::getCode, matnrGroup.getCode()));
        if (!list.isEmpty()) {
            return R.error("物料分组编码不能重复！！");
        }
        List<MatnrGroup> groups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                .eq(MatnrGroup::getName, matnrGroup.getName()));
        if (!groups.isEmpty()) {
            return R.error("分组已存在，请勿重复添加！！");
        }
        //判断上级编码是否为空
        if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
            matnrGroup.setParCode(matnrGroup.getParCode() + matnrGroup.getCode());
        }
        if (!matnrGroupService.save(matnrGroup)) {
            return R.error("Save Fail");
        }
@@ -73,8 +102,27 @@
    @OperationLog("Update 物料分类表")
    @PostMapping("/matnrGroup/update")
    public R update(@RequestBody MatnrGroup matnrGroup) {

        matnrGroup.setUpdateBy(getLoginUserId());
        matnrGroup.setUpdateTime(new Date());
        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()) {
                return R.error("仓库名已存在！！");
            }
        }
        if (!Objects.isNull(matnrGroup.getCode()) && !matnrGroup.getCode().equals(matGroup.getCode())) {
            List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                            .eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
                    .eq(MatnrGroup::getCode, matnrGroup.getCode()));
            if (!areasList.isEmpty()) {
                return R.error("仓库编码已存在！！");
            }
        }

        if (!matnrGroupService.updateById(matnrGroup)) {
            return R.error("Update Fail");
        }
@@ -107,18 +155,13 @@

    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @PostMapping("/matnrGroup/tree")
    public R tree(@RequestBody Map<String, Object> map) {
        List<MatnrGroup> matnrs = new ArrayList<>();
        matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
//        if (Objects.isNull(map)) {
//        } else {
//            if (Objects.isNull(map.get("condition"))) {
//                return R.ok("condition参数不能为空！！");
//            }
//            matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().like(MatnrGroup::getName, map.get("condition")));
//        }
        List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
        return R.ok().add(treeData);
    public R tree(@RequestBody(required = false) Map<String, Object> map) {
        if (Objects.isNull(map)) {
            return R.error("参数不能为空！！");
        }
        List<MatnrGroup> matnrs = matnrGroupService.getTreeData(map);

        return R.ok().add(matnrs);
    }