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

zjj

2 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

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

@@ -16,16 +16,16 @@
    TASK_TYPE_MERGE_IN("54", "并板再入库"),
    TASK_TYPE_CHECK_IN("57", "盘点再入库"),
    TASK_TYPE_OUT("101", "出库"),
    TASK_TYPE_PICK_AGAIN_IN("103", "拣料入库"),
    TASK_TYPE_PICK_AGAIN_IN("103", "拣料出库"),
    TASK_TYPE_MERGE_OUT("104", "并板出库"),
    TASK_TYPE_CHECK_OUT("107", "盘点出库"),
    TASK_TYPE_EMPITY_OUT("110", "空板出库"),
    ;
    public Short type;
    public Integer type;
    public String desc;

    TaskType(String type, String desc) {
        this.type = Short.parseShort(type);
        this.type = Integer.parseInt(type);
        this.desc = desc;
    }
}