Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

14 小时以前 c255a17d7ef4fabb37c1ac84b212768e73c42915

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java

@@ -79,6 +79,12 @@
    @ApiModelProperty(value= "库存数量")
    private Double anfme;

    @ApiModelProperty(value= "条形码")
    private String barcode;

    @ApiModelProperty("库位")
    private String locCode;

    /**
     * 状态 1: 正常  0: 冻结  
     */
@@ -225,20 +231,6 @@
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }



    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }

}