Merge branch 'master' of http://115.159.85.185:8098/r/LongTu/FangGangAGV

huangxiaoqiang

19 小时以前 e483ac11616ffc9260d8f491fcc0d66f480b5443

 Code Management/WCS/WIDESEA_WCSServer/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs

@@ -16,10 +16,10 @@
        Inbound = 200,

        /// <summary>
        /// 其他入库
        /// 空托入库
        /// </summary>
        [Description("其他入库")]
        InOther = 205,
        [Description("空托入库")]
        InTray = 205,
    }

    public enum TaskOutboundTypeEnum
@@ -30,29 +30,17 @@
        [Description("出库")]
        Outbound = 100,

        /// <summary>
        /// 调拨出库
        //// <summary>
        /// 空托出库
        /// </summary>
        [Description("调拨出库")]
        OutAllocate = 105,
        [Description("空托出库")]
        OutTray = 105,

        /// <summary>
        /// 其他出库
        //// <summary>
        /// 直接出库
        /// </summary>
        [Description("其他出库")]
        OutOther = 110,

        /// <summary>
        /// 生产领料出库
        /// </summary>
        [Description("生产领料出库")]
        MaterialRequisition = 115,

        /// <summary>
        /// 原材料出库
        /// </summary>
        [Description("原材料出库")]
        RawMaterials = 120,
        [Description("直接出库")]
        InToOut = 110
    }

    public enum TaskRelocationTypeEnum