zjj
昨天 d5540413a0163383b53d33aea1be93390ea9149c
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -1,27 +1,29 @@
package com.vincent.rsf.server.manager.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
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.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.manager.service.LocTypeService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.manager.service.WarehouseService;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Data
@Accessors(chain = true)
@TableName("man_loc")
public class Loc implements Serializable {
@@ -41,22 +43,27 @@
    private Long areaId;
    /**
     * 编号
     * 库位号
     */
    @ApiModelProperty(value= "编号")
    @ApiModelProperty(value= "库位号")
    private String code;
    /**
     * 库位类型
     * 仓库标识
     */
    @ApiModelProperty(value= "库位类型")
    private String type;
    @ApiModelProperty(value= "仓库标识")
    private Long warehouseId;
    /**
     * 名称
     * 库位类型(*) H:  高库位   M:  中库位   L:  低库位
     */
    @ApiModelProperty(value= "名称")
    private String name;
    @ApiModelProperty(value= "库位类型(*) H:  高库位   M:  中库位   L:  低库位  ")
    @TableField("`type`")
    private String type;
    @ApiModelProperty("库位类型(*)[man_loc_type]")
    @TableField(exist = false)
    private List<Long> typeIds;
    /**
     * 虚拟库位
@@ -83,16 +90,35 @@
    private String unit;
    /**
     * 长/宽/高
     * 长
     */
    @ApiModelProperty(value= "长/宽/高")
    private String size;
    @ApiModelProperty(value= "长")
    @TableField("`length`")
    private Double length;
    /**
     * 高
     */
    @ApiModelProperty(value= "高")
    private Double height;
    /**
     * 宽
     */
    @ApiModelProperty(value= "宽")
    private Double width;
    /**
     * 排
     */
    @ApiModelProperty(value= "排")
    @TableField("`row`")
    private Integer row;
    /**
     * 设备号
     */
    @ApiModelProperty(value= "设备号")
    private Integer deviceNo;
    /**
     * 列
@@ -107,9 +133,10 @@
    private Integer lev;
    /**
     * 通道
     * 巷道
     */
    @ApiModelProperty(value= "通道")
    @ApiModelProperty(value= "巷道")
    @TableField("`channel`")
    private Integer channel;
    /**
@@ -123,6 +150,12 @@
     */
    @ApiModelProperty(value= "最大包装数")
    private Integer maxPack;
    /**
     * 库位使用状态 O:  空库   D:  空板   R:  预约出库   S:  预约入库   X:  禁用    F:  在库
     */
    @ApiModelProperty(value= "库位使用状态 O:  空库   D:  空板   R:  预约出库   S:  预约入库   X:  禁用    F:  在库  ")
    private String useStatus;
    /**
     * 是否标签管理
@@ -140,6 +173,7 @@
     * 状态 1: 正常  0: 冻结  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 冻结  ")
    @TableField("`status`")
    private Integer status;
    /**
@@ -189,22 +223,25 @@
    public Loc() {}
    public Loc(Long areaId,String code,String type,String name,Short flagLogic,String fucAtrrs,String barcode,String unit,String size,Integer row,Integer col,Integer lev,Integer channel,Integer maxParts,Integer maxPack,Short flagLabelMange,String locAttrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
    public Loc(Long areaId, String code, Long warehouseId, String type, Short flagLogic, String fucAtrrs, String barcode, String unit, Double length, Double height, Double width, Integer row, Integer col, Integer lev, Integer channel, Integer maxParts, Integer maxPack, String useStatus, Short flagLabelMange, String locAttrs, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.areaId = areaId;
        this.code = code;
        this.warehouseId = warehouseId;
        this.type = type;
        this.name = name;
        this.flagLogic = flagLogic;
        this.fucAtrrs = fucAtrrs;
        this.barcode = barcode;
        this.unit = unit;
        this.size = size;
        this.length = length;
        this.height = height;
        this.width = width;
        this.row = row;
        this.col = col;
        this.lev = lev;
        this.channel = channel;
        this.maxParts = maxParts;
        this.maxPack = maxPack;
        this.useStatus = useStatus;
        this.flagLabelMange = flagLabelMange;
        this.locAttrs = locAttrs;
        this.status = status;
@@ -219,22 +256,25 @@
//    Loc loc = new Loc(
//            null,    // 库区标识[非空]
//            null,    // 编号[非空]
//            null,    // 库位类型[非空]
//            null,    // 名称
//            null,    // 库位号
//            null,    // 仓库标识[非空]
//            null,    // 库位类型(*)[非空]
//            null,    // 虚拟库位
//            null,    // 功能属性
//            null,    // 容器编码
//            null,    // 存放单位
//            null,    // 长/宽/高
//            null,    // 长
//            null,    // 高
//            null,    // 宽
//            null,    // 排[非空]
//            null,    // 列[非空]
//            null,    // 层[非空]
//            null,    // 通道[非空]
//            null,    // 巷道
//            null,    // 最大零件数
//            null,    // 最大包装数
//            null,    // 库位使用状态[非空]
//            null,    // 是否标签管理
//            null,    // 属性[非空]
//            null,    // 属性
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
@@ -245,6 +285,62 @@
//            null    // 备注
//    );
    public String getTypeIds$(){
        if (null == this.type){ return null; }
        String[] split = this.type.split(",");
        List<String> asList = Arrays.asList(split);
        if (asList.isEmpty()) {
            return null;
        }
        LocTypeService locTypeService = SpringUtils.getBean(LocTypeService.class);
        List<LocType> locTypes = locTypeService.list(new LambdaQueryWrapper<LocType>().in(LocType::getId, asList));
        if (locTypes.isEmpty()) {
            return null;
        }
        List<String> strings = locTypes.stream().map(LocType::getName).collect(Collectors.toList());
        return StringUtils.join(strings, ",");
    }
    public String getUseStatus$(){
        if (null == this.useStatus){ return null; }
        switch (this.useStatus){
            case  "O":
                return " 空库";
            case  "D":
                return " 空板";
            case  "R":
                return " 预约出库";
            case  "S":
                return " 预约入库";
            case  "X":
                return " 禁用";
            case  "F":
                return " 在库";
            default:
                return String.valueOf(this.useStatus);
        }
    }
    public String getWarehouseId$(){
        if (null == this.warehouseId){ return null; }
        WarehouseService service = SpringUtils.getBean(WarehouseService.class);
        Warehouse warehouse = service.getById(this.warehouseId);
        if (!Cools.isEmpty(warehouse)){
            return String.valueOf(warehouse.getName());
        }
        return null;
    }
    public String getAreaId$(){
        if (null == this.areaId){ return null; }
        WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
        WarehouseAreas warehouseAreas = service.getById(this.areaId);
        if (!Cools.isEmpty(warehouseAreas)){
            return String.valueOf(warehouseAreas.getName());
        }
        return null;
    }
    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){