#添加 1. 添加库位逻辑分区 2. 物料添加自动生成编码 3. 库区字段显示优化

skyouc

2025-03-20 51e9b24c421dd2e77ec5809a62c35fec115d5876

#添加
1. 添加库位逻辑分区
2. 物料添加自动生成编码
3. 库区字段显示优化

 rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java

@@ -22,8 +22,8 @@
//        generator.username="sa";
//        generator.password="Zoneyung@zy56$";

        generator.table="man_asn_order_item_log";
        generator.tableDesc="Asn order logs";
        generator.table="man_loc_area";
        generator.tableDesc="loc areas";
        generator.packagePath="com.vincent.rsf.server.manager";

        generator.build();

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

New file
@@ -0,0 +1,121 @@
package com.vincent.rsf.server.manager.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.LocArea;
import com.vincent.rsf.server.manager.service.LocAreaService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
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.*;

@Api(tags = "逻辑分区")
@RestController
public class LocAreaController extends BaseController {

    @Autowired
    private LocAreaService locAreaService;

    @PreAuthorize("hasAuthority('manager:locArea:list')")
    @PostMapping("/locArea/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<LocArea, BaseParam> pageParam = new PageParam<>(baseParam, LocArea.class);
        return R.ok().add(locAreaService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('manager:locArea:list')")
    @PostMapping("/locArea/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(locAreaService.list());
    }

    @PreAuthorize("hasAuthority('manager:locArea:list')")
    @PostMapping({"/locArea/many/{ids}", "/locAreas/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(locAreaService.listByIds(Arrays.asList(ids)));
    }

    @PreAuthorize("hasAuthority('manager:locArea:list')")
    @GetMapping("/locArea/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(locAreaService.getById(id));
    }

    @PreAuthorize("hasAuthority('manager:locArea:save')")
    @OperationLog("Create loc areas")
    @PostMapping("/locArea/save")
    public R save(@RequestBody LocArea locArea) {
        if (Objects.isNull(locArea)) {
            throw new CoolException("参数不能为空！！");
        }
        if (Objects.isNull(locArea.getAreaId())) {
            throw new CoolException("库区不能为空！！");
        }
        if (Objects.isNull(locArea.getLocId())) {
            throw new CoolException("库位不能为空！！");
        }

        locArea.setCreateBy(getLoginUserId());
        locArea.setUpdateBy(getLoginUserId());
        if (!locAreaService.save(locArea)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(locArea);
    }

    @PreAuthorize("hasAuthority('manager:locArea:update')")
    @OperationLog("Update loc areas")
    @PostMapping("/locArea/update")
    public R update(@RequestBody LocArea locArea) {
        locArea.setUpdateBy(getLoginUserId());
        locArea.setUpdateTime(new Date());
        if (!locAreaService.updateById(locArea)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(locArea);
    }

    @PreAuthorize("hasAuthority('manager:locArea:remove')")
    @OperationLog("Delete loc areas")
    @PostMapping("/locArea/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!locAreaService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
    }

    @PreAuthorize("hasAuthority('manager:locArea:list')")
    @PostMapping("/locArea/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<LocArea> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(LocArea::getName, condition);
        }
        locAreaService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getName()))
        );
        return R.ok().add(vos);
    }

    @PreAuthorize("hasAuthority('manager:locArea:list')")
    @PostMapping("/locArea/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(locAreaService.list(), LocArea.class), response);
    }

}

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

@@ -17,7 +17,9 @@
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -77,15 +79,17 @@
        if (Objects.isNull(matnr.get("matnr"))) {
            throw new CoolException("名称不能为空！！");
        }
        if (Objects.isNull(matnr.get("code"))) {
            throw new CoolException("编码不能为空！！");
        }
        if (Objects.isNull(matnr.get("groupId"))) {
            throw new CoolException("物料分组不能为空！！");
        }

        Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);

        if (Objects.isNull(matnr1.getCode())) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
            System.out.println("=========>");
            System.out.println(ruleCode);
            matnr1.setCode(ruleCode);
        }
        /**
         * 扩展字段存入库
         */
@@ -109,8 +113,13 @@
    @PostMapping("/matnr/update")
    @Transactional(rollbackFor = Exception.class)
    public R update(@RequestBody Map<String, Object> params) {

        Matnr matnr = JSONObject.parseObject(JSONObject.toJSONString(params), Matnr.class);
        if (Objects.isNull(matnr.getCode())) {
            throw new CoolException("编码不能为空！！");
        }
        if (Objects.isNull(matnr.getName())) {
            throw new CoolException("名称不能为空！！");
        }
        matnr.setUpdateBy(getLoginUserId());
        if (!matnrService.updateById(matnr)) {
            return R.error("Update Fail");

 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");
        }

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

@@ -105,7 +105,8 @@
        if (ids.length < 1) {
            throw new CoolException("查询id不能为空！！");
        }
        List<WarehouseAreas> warehouseAreas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().in(WarehouseAreas::getWareId, ids));
        List<WarehouseAreas> warehouseAreas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
                .in(WarehouseAreas::getWarehouseId, ids));
        if (!warehouseAreas.isEmpty()) {
            throw new CoolException("当前仓库下有未删除库区， 不可操作删除！！");
        }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java

New file
@@ -0,0 +1,223 @@
package com.vincent.rsf.server.manager.entity;

import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_loc_area")
public class LocArea implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 名称
     */
    @ApiModelProperty(value= "名称")
    private String name;

    /**
     * 助记码
     */
    @ApiModelProperty(value= "助记码")
    private String code;

    /**
     * 库区ID(*)
     */
    @ApiModelProperty(value= "库区ID(*)")
    private Long areaId;

    /**
     * 库位ID(*)
     */
    @ApiModelProperty(value= "库位ID(*)")
    private Long locId;

    /**
     * 状态 1: 正常  0: 冻结  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 冻结  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**
     * 租户
     */
    @ApiModelProperty(value= "租户")
    private Integer tenantId;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    private Long createBy;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    private Long updateBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    public LocArea() {}

    public LocArea(String name,String code,Long areaId,Long locId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.name = name;
        this.code = code;
        this.areaId = areaId;
        this.locId = locId;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    }

//    LocArea locArea = new LocArea(
//            null,    // 名称
//            null,    // 助记码
//            null,    // 库区ID(*)
//            null,    // 库位ID(*)
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间[非空]
//            null    // 备注
//    );

    public String getAreaId$(){
        WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
        WarehouseAreas warehouseArea = service.getById(this.areaId);
        if (!Cools.isEmpty(warehouseArea)){
            return String.valueOf(warehouseArea.getName());
        }
        return null;
    }

    public String getLocId$(){
        LocService service = SpringUtils.getBean(LocService.class);
        Loc loc = service.getById(this.locId);
        if (!Cools.isEmpty(loc)){
            return String.valueOf(loc.getCode());
        }
        return null;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
            case 0:
                return "冻结";
            default:
                return String.valueOf(this.status);
        }
    }

    public String getCreateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.createBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getUpdateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.updateBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }



    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java

@@ -6,6 +6,7 @@

import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.ShipperService;
import com.vincent.rsf.server.manager.service.WarehouseService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -23,6 +24,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
import java.util.Objects;

@Data
@TableName("man_warehouse_areas")
@@ -41,7 +43,7 @@
     * 仓库ID
     */
    @ApiModelProperty("仓库ID")
    private Long wareId;
    private Long warehouseId;

    /**
     * 编号
@@ -191,6 +193,16 @@
        return null;
    }

    public String getWarehouseId$() {
        if (this.warehouseId == null) { return null; }
        WarehouseService warehouseService = SpringUtils.getBean(WarehouseService.class);
        Warehouse warehouse = warehouseService.getById(this.warehouseId);
        if (!Objects.isNull(warehouse)) {
            return warehouse.getName();
        }
        return null;
    }

    public String getSupplier$() {
        CompanysService service = SpringUtils.getBean(CompanysService.class);
        Companys supplier = service.getById(this.supplierId);

 rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaMapper.java

New file
@@ -0,0 +1,12 @@
package com.vincent.rsf.server.manager.mapper;

import com.vincent.rsf.server.manager.entity.LocArea;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface LocAreaMapper extends BaseMapper<LocArea> {

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaService.java

New file
@@ -0,0 +1,8 @@
package com.vincent.rsf.server.manager.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.server.manager.entity.LocArea;

public interface LocAreaService extends IService<LocArea> {

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.vincent.rsf.server.manager.service.impl;

import com.vincent.rsf.server.manager.mapper.LocAreaMapper;
import com.vincent.rsf.server.manager.entity.LocArea;
import com.vincent.rsf.server.manager.service.LocAreaService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("locAreaService")
public class LocAreaServiceImpl extends ServiceImpl<LocAreaMapper, LocArea> implements LocAreaService {

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java

@@ -93,7 +93,7 @@
                            .setCol(b)
                            .setLev(l)
                            .setAreaId(param.getAreaId())
                            .setWarehouseId(warehouseAreas.getWareId())
                            .setWarehouseId(warehouseAreas.getWarehouseId())
                            .setType(param.getType());

                    list.add(loc);

 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java

@@ -33,4 +33,10 @@
     * 质检单业务类型
     */
    public final static String SYS_INSPECT_WK_TYPE = "sys_inspect_wk_type";

    /**
     * 物料编码生成规则
     */
    public final static String SYS_MATNR_CODE = "sys_matnr_code";

}

 rsf-server/src/main/java/com/vincent/rsf/server/system/enums/SerialRuleReset.java

@@ -14,7 +14,9 @@
    //重置类型：月
    SERIAL_REST_TYPE_MONTH("month", "月"),
    //重置类型：日
    SERIAL_REST_TYPE_DAYS("day", "日")
    SERIAL_REST_TYPE_DAYS("day", "日"),

    SERIAL_REST_TYPE_NON("non", "无")
    ;

    public String type;

 rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java

@@ -64,7 +64,7 @@
                     format = DateUtils.format(new Date(), "yyyy");
                } else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_MONTH.type)) {
                     format = DateUtils.format(new Date(), "MM");
                } else {
                } else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
                     format = DateUtils.format(new Date(), "dd");
                }
                //当前值自动加1

 rsf-server/src/main/java/locArea.sql

New file
@@ -0,0 +1,25 @@
-- save locArea record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.locArea', '0', '/manager/locArea', 'locArea', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query loc areas', '185', '1', 'manager:locArea:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create loc areas', '185', '1', 'manager:locArea:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update loc areas', '185', '1', 'manager:locArea:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete loc areas', '185', '1', 'manager:locArea:remove', '3', '1', '1');

-- locale menu name
locArea: 'LocArea',

-- locale field
locArea: {
    name: "name",
    code: "code",
    areaId: "areaId",
    locId: "locId",
},

-- ResourceContent
import locArea from './locArea';

case 'locArea':
    return locArea;

 rsf-server/src/main/resources/mapper/manager/LocAreaMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vincent.rsf.server.manager.mapper.LocAreaMapper">

</mapper>