#

LSH

2023-05-16 2bf65500161ae37c120d0d9af8f6d8dd7afdec75

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

@@ -90,11 +90,11 @@
    @TableField("loc_type")
    private String locType;

    @ApiModelProperty(value= "高低类型{0:未知,1:低库位,2:高库位}")
    @ApiModelProperty(value= "库位类型：1：测试库位、2：静置库位、3：测试前暂存库为、4：测试失败库位、0：未知")
    @TableField("loc_type1")
    private Short locType1;

    @ApiModelProperty(value= "宽窄类型{0:未知,1:窄库位,2:宽库位}")
    @ApiModelProperty(value= "通道：1、2、3、4、5、6")
    @TableField("loc_type2")
    private Short locType2;

@@ -176,6 +176,24 @@
    @TableField("ctn_no")
    private String ctnNo;

//    消防点编号
    @ApiModelProperty(value= "")
    @TableField("fire_no")
    private String fireNo;

//    消防状态{0:正常,1:报警}
    @ApiModelProperty(value= "")
    @TableField("fire_status")
    private Integer fireStatus;

//    产品状态{0:无,1:待测,2:测试中;3.测试完成;4.测试失败;5.静置中;6:静置完成;7:暂停测试;8:紧急出库;}
    @ApiModelProperty(value= "")
    @TableField("pack_status")
    private Integer packStatus;

    @ApiModelProperty(value= "通道")
    private Integer channel;


    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -215,9 +233,13 @@
            case 0:
                return "未知";
            case 1:
                return "低库位";
                return "测试库位";
            case 2:
                return "高库位";
                return "静置库位";
            case 3:
                return "测试前暂存库位";
            case 4:
                return "NG库位";
            default:
                return String.valueOf(this.locType1);
        }
@@ -227,13 +249,22 @@
        if (null == this.locType2){ return null; }
        switch (this.locType2){
            case 0:
                return "未知";
                return "";
            case 1:
                return "窄库位";
                return "1号";
            case 2:
                return "宽库位";
                return "2号";
            case 3:
                return "3号";
            case 4:
                return "4号";
            case 5:
                return "5号";
            case 6:
                return "6号";
            default:
                return String.valueOf(this.locType2);
//                return String.valueOf(this.locType2);
                return "";
        }
    }

@@ -290,4 +321,43 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
    }

    public String getFireStatus$() {
        if (null == this.fireStatus){ return null; }
        switch (this.fireStatus){
            case 0:
                return "正常";
            case 1:
                return "报警";
            default:
                return String.valueOf(this.fireStatus);
        }
    }

//    产品状态{0:无,1:待测,2:测试中;3.测试完成;4.测试失败;5.静置中;6:静置完成;7:暂停测试;8:紧急出库;}
    public String getPackStatus$() {
        if (null == this.packStatus){ return null; }
        switch (this.packStatus){
            case 0:
                return "无";
            case 1:
                return "待测";
            case 2:
                return "测试中";
            case 3:
                return "测试完成";
            case 4:
                return "测试NG";
            case 5:
                return "静置中";
            case 6:
                return "静置完成";
            case 7:
                return "暂停测试";
            case 8:
                return "紧急出库";
            default:
                return String.valueOf(this.packStatus);
        }
    }

}