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

zjj

3 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java

@@ -17,7 +17,9 @@
//

//    WCS_PUTAWAY_SUSPEND(13L, "入库任务挂起"),



    COMPLETE_IN("99", "入库完成"),

    COMPLETE_IN("98", "入库完成"),



    REPORT_IN("99", "上报完成"),



    UPDATED_IN("100", "库存更新完成"),



@@ -39,14 +41,15 @@
    WAVE_SEED("198", "播种中"),



    COMPLETE_OUT("199", "出库完成"),



    UPDATED_OUT("200", "库存更新完成"),

    ;



    public Short id;

    public Integer id;

    public String desc;



    TaskStsType(String id, String desc) {

        this.id = Short.parseShort(id);

        this.id = Integer.parseInt(id);

        this.desc = desc;

    }