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

zjj

2024-12-26 a484168b903a919b24d65a5d95dea88a04d8f34c

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

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.RowLastnoTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -134,6 +136,41 @@
    @ApiModelProperty(value= "其它标记类别")
    @TableField("sign_type_other_boolean")
    private String signTypeOtherBoolean;

    /**
     * 其它标记类别（是否输送线互通）
     */
    @ApiModelProperty(value= "入库站点集合")
    @TableField("sta_no_list")
    private String staNoList;

    /**
     * 库类型ID
     */
    @ApiModelProperty(value= "库类型ID")
    @TableField("type_id")
    private Integer typeId;

    /**
     * 相似物料开关
     */
    @ApiModelProperty(value= "相似物料开关")
    @TableField("be_similar")
    private String beSimilar;

    /**
     * 是否存在点位
     */
    @ApiModelProperty(value= "是否存在点位")
    @TableField("point_switch")
    private String pointSwitch;

    /**
     * 空板靠近摆放
     */
    @ApiModelProperty(value= "空板靠近摆放")
    @TableField("empty_similar")
    private String emptySimilar;

    public RowLastno() {}

@@ -332,4 +369,54 @@
        this.signTypeOtherBoolean = signTypeOtherBoolean;
    }

    public String getStaNoList() {
        return staNoList;
    }

    public void setStaNoList(String StaNoList) {
        this.staNoList = StaNoList;
    }

    public Integer getTypeId() {
        return typeId;
    }
    public String getTypeId$() {
        RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
        RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
        BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = basWhsService.selectById(rowLastnoType.getType().longValue());
        if (!Cools.isEmpty(rowLastnoType)){
            return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+basWhs.getWhsDesc();
        }
        return typeId.toString();
    }

    public void setTypeId(Integer typeId) {
        this.typeId = typeId;
    }

    public String getBeSimilar() {
        return beSimilar;
    }

    public void setBeSimilar(String beSimilar) {
        this.beSimilar = beSimilar;
    }

    public String getPointSwitch() {
        return pointSwitch;
    }

    public void setPointSwitch(String pointSwitch) {
        this.pointSwitch = pointSwitch;
    }

    public String getEmptySimilar() {
        return emptySimilar;
    }

    public void setEmptySimilar(String emptySimilar) {
        this.emptySimilar = emptySimilar;
    }

}