#

zwl

14 小时以前 44b6b79dd5dee0ebbd2d11b08abbc2be275bed58

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

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.BasLocStsService;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -100,11 +100,11 @@
    @TableField("loc_type1")
    private Short locType1;

    @ApiModelProperty(value= "宽窄类型{0:未知,1:窄库位,2:宽库位}")
    @ApiModelProperty(value= "机台号")
    @TableField("loc_type2")
    private Short locType2;

    @ApiModelProperty(value= "轻重类型{0:未知,1:轻库位,2:重库位}")
    @ApiModelProperty(value= "机台号排序")
    @TableField("loc_type3")
    private Short locType3;

@@ -182,6 +182,17 @@
    @TableField("ctn_no")
    private String ctnNo;

    @ApiModelProperty(value= "库区ID")
    @TableField("area_id")
    private Long areaId;

    @ApiModelProperty(value= "库区名称")
    @TableField("area_name")
    private String areaName;

    @ApiModelProperty("逻辑删除 默认 0， 删除：1")
    private Integer deleted;

    /**
     * 是否冻结
     */
@@ -197,10 +208,10 @@


    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = service.selectById(this.whsType);
        if (!Cools.isEmpty(basWhs)){
            return String.valueOf(basWhs.getWhsDesc());
        BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
        BasWhsType basWhsType = service.selectById(this.whsType);
        if (!Cools.isEmpty(basWhsType)){
            return String.valueOf(basWhsType.getWhsDesc());
        }
        return null;
    }