Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs

lty

17 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

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

@@ -2,9 +2,11 @@

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;

import com.core.common.SpringUtils;
import com.zy.asrs.service.BasDeviceService;
import com.zy.asrs.service.BasLocStsService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -47,7 +49,7 @@
     */
    @ApiModelProperty(value= "库位码")
    @TableField("b_loc_no")
    private String bLocNo;
    private String blocNo;

    @ApiModelProperty("是否默认")
    @TableField("is_default")
@@ -61,13 +63,21 @@
    @TableField("dev_name")
    private String devName;

    @ApiModelProperty("机台顺序")
    @TableField("order_no")
    private Integer orderNo;

    @ApiModelProperty("是否冻结")
    @TableField("freeze")
    private Integer freeze;

    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$() {
@@ -75,6 +85,15 @@
            return "备用";
        } else {
            return "默认";
        }
    }
    public String getDevNo$() {
        BasDeviceService bean = SpringUtils.getBean(BasDeviceService.class);
        BasDevice type = bean.selectOne(new EntityWrapper<BasDevice>().eq("type", devNo));
        if (type == null) {
            return "<UNK>";
        }else {
            return type.getDevNo();
        }
    }

@@ -99,4 +118,11 @@
//    );


    public LocAroundBind(Long devId, String devNo, String blocNo, String locType, int orderNo) {
        this.devId = devId;
        this.devNo = devNo;
        this.blocNo = blocNo;
        this.locType = locType;
        this.orderNo = orderNo;
    }
}