修改 # 物料分组编码规则优化

skyouc

2025-03-25 ef69d3bad0c7f03da11cb1c1e46a84bcebe02bc4

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java

@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.controller;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -18,8 +19,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
@@ -65,10 +68,26 @@
    @OperationLog("Create 库位信息表")
    @PostMapping("/loc/save")
    public R save(@RequestBody Loc loc) {
        if (Objects.isNull(loc.getWarehouseId())) {
            throw new CoolException("仓库ID不能为空！！");
        }
        if (Objects.isNull(loc.getAreaId())) {
            throw new CoolException("仓库ID不能为空！！");
        }
        if (Objects.isNull(loc.getTypeIds())) {
            throw new CoolException("库位类型不能为空！！");
        }
        String join = StringUtils.join(loc.getTypeIds(), ",");
        loc.setType(join);

        loc.setCreateBy(getLoginUserId());
        loc.setUpdateBy(getLoginUserId());
        if (!locService.save(loc)) {
            return R.error("Save Fail");
        }

        if (!locService.saveType(loc)) {
            throw new CoolException("库位类型关联关系保存失败！！");
        }
        return R.ok("Save Success").add(loc);
    }
@@ -76,11 +95,19 @@
    @PreAuthorize("hasAuthority('manager:loc:update')")
    @OperationLog("Update 库位信息表")
    @PostMapping("/loc/update")
    @Transactional(rollbackFor = Exception.class)
    public R update(@RequestBody Loc loc) {
        loc.setUpdateBy(getLoginUserId());
        loc.setUpdateTime(new Date());
        String join = StringUtils.join(loc.getTypeIds(), ",");
        loc.setType(join);
        if (Objects.isNull(loc.getTypeIds())) {
            throw new CoolException("库位类型不能为空！！");
        }
        if (!locService.updateById(loc)) {
            return R.error("Update Fail");
        }
        if (!locService.updateLoc(loc)) {
            throw new CoolException("库位类型关联关系修改失败!@！");
        }
        return R.ok("Update Success").add(loc);
    }
@@ -132,16 +159,52 @@
        return locService.modifyLocs(locs);
    }

    @PreAuthorize("hasAuthority('manager:loc:update')")
    @PostMapping("/loc/batch/area")
    @ApiOperation("库位批量分区")
    public R batchLocArea(@RequestBody LocModifyParams locs) {
        if (Objects.isNull(locs)) {
            throw new CoolException("参数不能为空！！");
        }
        locs.setCreateBy(getLoginUserId());
        locs.setUpdateBy(getLoginUserId());
        return locService.batchBindLocs(locs);
    }


    @PreAuthorize("hasAuthority('manager:loc:update')")
    @ApiOperation("库位初始化")
    @PostMapping("/loc/init")
    public R initLocInfo(@Valid @RequestBody LocMastInitParam param) {
        if (Objects.isNull(param)) {
            throw new CoolException("初始化信息不能为空！！");
            return R.error("初始化信息不能为空！！");
        }
        if (Objects.isNull(param.getTypeIds()) && param.getTypeIds().isEmpty()) {
            return R.error("库位类型不能为空！！");
        }
        if (Objects.isNull(param.getWarehouseId())) {
            return R.error("仓库ID不能为空！！");
        }
        if (Objects.isNull(param.getAreaId())) {
            throw new CoolException("库区ID不能为空！！");
            return R.error("库区ID不能为空！！");
        }
        if (Objects.isNull(param.getStartRow())) {
            return R.error("起始排不能为空！！");
        }
        if (Objects.isNull(param.getEndRow())) {
            return R.error("终止排不能为空！！");
        }
        if (Objects.isNull(param.getStartBay())) {
            return R.error("起始列不能为空！！");
        }
        if (Objects.isNull(param.getEndBay())) {
            return R.error("终止列不能为空！！");
        }
        if (Objects.isNull(param.getStartLev())) {
            return R.error("起始层不能为空！！");
        }
        if (Objects.isNull(param.getEndLev())) {
            return R.error("终止层不能为空！！");
        }
        return locService.initLocs(param);
    }