Merge branch 'xiaoyang' into dev

wanshenmean

5 小时以前 e4921e003cc293fea714bdaf74dc6a6b6b750295

 Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs

@@ -19,15 +19,15 @@
        Undefined = 0,

        /// <summary>
        /// 小托盘
        /// 货架
        /// </summary>
        [Description("小托盘")]
        SmallPallet = 1,
        [Description("货架")]
        ShelfCapacity = 1,

        /// <summary>
        /// 中托盘
        /// 卷绕段
        /// </summary>
        [Description("中托盘")]
        [Description("卷绕段")]
        MediumPallet = 2,

        /// <summary>
@@ -41,5 +41,17 @@
        /// </summary>
        [Description("特大托盘")]
        ExtraPallet = 4,

        /// <summary>
        /// 分容工装架
        /// </summary>
        [Description("分容工装架")]
        SubRackType = 5,

        /// <summary>
        /// 分容柜
        /// </summary>
        [Description("分容柜")]
        Capacity = 6,
    }
}