From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs | 189 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 147 insertions(+), 42 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
index 4143d5b..90c524e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
@@ -7,102 +7,207 @@
namespace WIDESEA_Common.TaskEnum
{
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
public enum TaskTypeEnum
{
/// <summary>
- /// 鍑哄簱 =100
+ /// 棰嗘枡鍑哄簱
/// </summary>
- [Description("鍑哄簱")]
+ [Description("棰嗘枡鍑哄簱")]
Outbound = 100,
-
/// <summary>
/// 鐩樼偣鍑哄簱
/// </summary>
[Description("鐩樼偣鍑哄簱")]
- OutInventory = 101,
-
+ OutInventory = 110,
/// <summary>
/// 鍒嗘嫞鍑哄簱
/// </summary>
[Description("鍒嗘嫞鍑哄簱")]
- OutPick = 102,
-
+ OutPick = 120,
/// <summary>
/// 璐ㄦ鍑哄簱
/// </summary>
[Description("璐ㄦ鍑哄簱")]
- OutQuality = 103,
+ OutQuality = 130,
/// <summary>
- /// 鍑虹┖
+ /// 绌虹鍑哄簱
/// </summary>
- [Description("鍑虹┖")]
- PalletOutbound = 104,
+ [Description("绌虹鍑哄簱")]
+ OutEmpty = 140,
/// <summary>
- /// 琛ョ┖
+ /// 璋冩嫧鍑哄簱
/// </summary>
- [Description("琛ョ┖")]
- PalletFillOutbound = 105,
+ [Description("璋冩嫧鍑哄簱")]
+ OutAllocate = 150,
/// <summary>
- /// 鍏ュ簱
+ /// MES鍑哄簱
/// </summary>
- [Description("鍏ュ簱")]
- Inbound = 200,
+ [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 = 201,
-
+ InInventory = 520,
/// <summary>
/// 鍒嗘嫞鍏ュ簱
/// </summary>
[Description("鍒嗘嫞鍏ュ簱")]
- InPick = 202,
-
+ InPick = 530,
/// <summary>
/// 璐ㄦ鍏ュ簱
/// </summary>
[Description("璐ㄦ鍏ュ簱")]
- InQuality = 203,
+ InQuality = 540,
/// <summary>
- /// 鍏ョ┖
+ /// 鐢熶骇閫�鏂�
/// </summary>
- [Description("鍏ョ┖")]
- PalletInbound = 204,
+ [Description("鐢熶骇閫�鏂�")]
+ ProductionReturn = 550,
/// <summary>
- /// 鍥炵┖
+ /// MES閫�鏂�
/// </summary>
- [Description("鍥炵┖")]
- PalletReturnInbound = 205,
+ [Description("MES閫�鏂�")]
+ MesMatReturn = 560,
/// <summary>
- /// 绉诲簱
+ /// 璋冩嫧鍏ュ簱
/// </summary>
- [Description("绉诲簱")]
- Relocation = 300,
+ [Description("璋冩嫧鍏ュ簱")]
+ InAllocate = 570,
/// <summary>
- /// 搴撳唴绉诲簱
+ /// MES澶х┖鎵橀��鏂�
/// </summary>
- [Description("搴撳唴绉诲簱")]
- RelocationIn = 301,
+ [Description("MES澶х┖鎵橀��鏂�")]
+ MesPalletLargeReturn = 580,
/// <summary>
- /// 搴撳绉诲簱
+ /// MES灏忕┖鎵橀��鏂�
/// </summary>
- [Description("搴撳绉诲簱")]
- RelocationOut = 302,
+ [Description("MES灏忕┖鎵橀��鏂�")]
+ MesPalletSmallReturn = 585,
- [Description("AGV鎼繍")]
- AGVCarry = 500,
+ /// <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("宸烽亾鍐呯Щ搴�")]
+ Relocation = 900
+
+ }
+
+ public enum TaskTypeGroup
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ InboundGroup,
+
+ /// <summary>
+ ///
+ /// </summary>
+ OutbondGroup,
+
+ /// <summary>
+ ///
+ /// </summary>
+ RelocationGroup,
+
+ /// <summary>
+ ///
+ /// </summary>
+ OtherGroup
}
}
--
Gitblit v1.9.3