Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

yangyang

2025-03-21 8edc8701512d6a02492c8f8d38c05a4253650117

 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,8 +125,16 @@

    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @PostMapping("/matnrGroup/tree")
    public R tree() {
        List<MatnrGroup> matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
    public R tree(@RequestBody(required = false) Map<String, Object> map) {
        List<MatnrGroup> matnrs = new ArrayList<>();
        if (Objects.isNull(map)) {
            matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
        } 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);
    }