Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

helongyang

11 小时以前 dc06f58d8ed537555fd529551180f43a0586ec3f

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs

@@ -14,16 +14,19 @@
        /// </summary>
        [Description("领料出库")]
        Outbound = 100,

        /// <summary>
        /// ç›˜ç‚¹å‡ºåº“
        /// </summary>
        [Description("盘点出库")]
        OutInventory = 110,

        /// <summary>
        /// åˆ†æ‹£å‡ºåº“
        /// </summary>
        [Description("分拣出库")]
        OutPick = 120,

        /// <summary>
        /// è´¨æ£€å‡ºåº“
        /// </summary>
@@ -31,25 +34,94 @@
        OutQuality = 130,

        /// <summary>
        /// ç©ºç®±å‡ºåº“
        /// </summary>
        [Description("空箱出库")]
        OutEmpty = 140,

        /// <summary>
        /// è°ƒæ‹¨å‡ºåº“
        /// </summary>
        [Description("调拨出库")]
        OutAllocate = 150,

        /// <summary>
        /// MES出库
        /// </summary>
        [Description("MES出库")]
        MesOutbound = 200,

        /// <summary>
        /// MES手动出库
        /// </summary>
        [Description("MES手动出库")]
        MesHandOutbound = 210,

        /// <summary>
        /// MES手动拣选出库
        /// </summary>
        [Description("MES手动拣选出库")]
        MesHandPickOutbound = 220,
        /// <summary>
        /// æˆå“å‡ºåº“
        /// </summary>
        [Description("成品出库")]
        OutProduct = 230,

        /// <summary>
        /// æˆå“å¯„售出库
        /// </summary>
        [Description("成品寄售出库")]
        OutSendProduct = 240,

        /// <summary>
        /// æˆå“MES提库
        /// </summary>
        [Description("成品MES提库")]
        OutMesRworkProduct = 250,

        /// <summary>
        /// é˜²ç„Šå‰æ´¾å·¥å°ä»¶
        /// </summary>
        [Description("防焊前派工小件")]
        MaskOutNoticeSmall = 260,

        /// <summary>
        /// é˜²ç„Šå‰æ´¾å·¥å¤§ä»¶
        /// </summary>
        [Description("防焊前派工大件")]
        MaskOutNoticeLarge = 265,

        /// <summary>
        /// é˜²ç„Šåˆ°çº¿è¾¹å°ä»¶
        /// </summary>
        [Description("防焊到线边小件")]
        MaskOutSmall = 270,

        /// <summary>
        /// é˜²ç„Šåˆ°çº¿è¾¹å¤§ä»¶
        /// </summary>
        [Description("防焊到线边大件")]
        MaskOutLarge = 275,

        /// <summary>
        /// é‡‡è´­å…¥åº“
        /// </summary>
        [Description("采购入库")]
        Inbound = 510,

        /// <summary>
        /// ç›˜ç‚¹å…¥åº“
        /// </summary>
        [Description("盘点入库")]
        InInventory = 520,

        /// <summary>
        /// åˆ†æ‹£å…¥åº“
        /// </summary>
        [Description("分拣入库")]
        InPick = 530,

        /// <summary>
        /// è´¨æ£€å…¥åº“
        /// </summary>
@@ -63,18 +135,62 @@
        ProductionReturn = 550,

        /// <summary>
        /// çº¿è¾¹ä»“入库
        /// MES退料
        /// </summary>
        [Description("线边仓入库")]
        InboundXB = 560,
        [Description("MES退料")]
        MesMatReturn = 560,

        /// <summary>
        /// æœºå°å…¥åº“
        /// è°ƒæ‹¨å…¥åº“
        /// </summary>
        [Description("机台入库")]
        InboundJT = 570,
        [Description("调拨入库")]
        InAllocate = 570,

        /// <summary>
        /// MES大空托退料
        /// </summary>
        [Description("MES大空托退料")]
        MesPalletLargeReturn = 580,

        /// <summary>
        /// MES小空托退料
        /// </summary>
        [Description("MES小空托退料")]
        MesPalletSmallReturn = 585,

        /// <summary>
        /// ç©ºç®±å…¥åº“
        /// </summary>
        [Description("空箱入库")]
        InEmpty = 600,

        /// <summary>
        /// æˆå“å…¥åº“
        /// </summary>
        [Description("成品入库")]
        InProduct = 610,

        /// <summary>
        /// æˆå“ä½™æ–™å›žåº“
        /// </summary>
        [Description("成品余料回库")]
        InProductBack = 620,
        /// <summary>
        /// æˆå“ç©ºæ¡†å›žåº“
        /// </summary>
        [Description("成品空框回库")]
        EmptyProductBack = 630,
        /// <summary>
        /// é˜»ç„Šå…¥åº“小件
        /// </summary>
        [Description("阻焊入库小件")]
        InZHProductSmall = 640,
        /// <summary>
        /// é˜»ç„Šå…¥åº“大件
        /// </summary>
        [Description("阻焊入库大件")]
        InZHProductLarge = 645,
        /// <summary>
        /// å··é“内移库
        /// </summary>
        [Description("巷道内移库")]