空板改余料回库优化

skyouc

3 小时以前 8ae2f2dcfe7e263d42c21ed7644641c780445b95

 src/main/java/com/zy/asrs/entity/LocAroundBind.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;

import com.core.common.SpringUtils;
import com.zy.asrs.service.BasLocStsService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -20,16 +22,16 @@
    private Long id;

    /**
     * 台机ID
     * 机台ID
     */
    @ApiModelProperty(value= "台机ID")
    @ApiModelProperty(value= "机台ID")
    @TableField("dev_id")
    private Long devId;

    /**
     * 台机号
     * 机台号
     */
    @ApiModelProperty(value= "台机号")
    @ApiModelProperty(value= "机台号")
    @TableField("dev_no")
    private String devNo;

@@ -45,20 +47,53 @@
     */
    @ApiModelProperty(value= "库位码")
    @TableField("b_loc_no")
    private String bLocNo;
    private String blocNo;

    @ApiModelProperty("是否默认")
    @TableField("is_default")
    private Integer isDefault;

    @ApiModelProperty("工位状态")
    @TableField("loc_type")
    private String locType;

    @ApiModelProperty("机台名称")
    @TableField("dev_name")
    private String devName;

    public LocAroundBind() {}

    public LocAroundBind(Long devId,String devNo,Long bLocId,String bLocNo) {
    public LocAroundBind(Long devId,String devNo,Long bLocId,String blocNo) {
        this.devId = devId;
        this.devNo = devNo;
        this.bLocId = bLocId;
        this.bLocNo = bLocNo;
        this.blocNo = blocNo;
    }

    public String getDef$() {
        if (this.isDefault == 0) {
            return "备用";
        } else {
            return "默认";
        }
    }

    public String getLocType$() {
        if (this.locType == null) {
            return null;
        }
        BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
        BasLocSts basLocSts = service.selectById(this.locType);
        if (!Cools.isEmpty(basLocSts)){
            return String.valueOf(basLocSts.getLocDesc());
        }
        return null;

    }

//    LocAroundBind locAroundBind = new LocAroundBind(
//            null,    // 台机ID[非空]
//            null,    // 台机号[非空]
//            null,    // 机台ID[非空]
//            null,    // 机台号[非空]
//            null,    // 库位ID[非空]
//            null    // 库位码[非空]
//    );