From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 15 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
index 41a8b43..7fe6c29 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
@@ -14,31 +14,37 @@
/// </summary>
[Description("棰嗘枡鍑哄簱")]
Outbound = 100,
+
/// <summary>
/// 鐩樼偣鍑哄簱
/// </summary>
[Description("鐩樼偣鍑哄簱")]
OutInventory = 110,
+
/// <summary>
/// 鍒嗘嫞鍑哄簱
/// </summary>
[Description("鍒嗘嫞鍑哄簱")]
OutPick = 120,
+
/// <summary>
/// 璐ㄦ鍑哄簱
/// </summary>
[Description("璐ㄦ鍑哄簱")]
OutQuality = 130,
+
/// <summary>
/// 绌虹鍑哄簱
/// </summary>
[Description("绌虹鍑哄簱")]
OutEmpty = 140,
+
/// <summary>
/// 璋冩嫧鍑哄簱
/// </summary>
[Description("璋冩嫧鍑哄簱")]
OutAllocate = 150,
+
/// <summary>
/// MES鍑哄簱
/// </summary>
@@ -61,31 +67,61 @@
/// </summary>
[Description("鎴愬搧鍑哄簱")]
OutProduct = 230,
+
/// <summary>
/// 鎴愬搧瀵勫敭鍑哄簱
/// </summary>
[Description("鎴愬搧瀵勫敭鍑哄簱")]
OutSendProduct = 240,
+
/// <summary>
- /// 鎴愬搧MES鍑哄簱/鎻愬簱
+ /// 鎴愬搧MES鎻愬簱
/// </summary>
- [Description("鎴愬搧MES鍑哄簱/鎻愬簱")]
+ [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>
@@ -105,28 +141,22 @@
MesMatReturn = 560,
/// <summary>
- /// MES绌烘墭閫�鏂�
- /// </summary>
- [Description("MES绌烘墭閫�鏂�")]
- MesPalletReturn = 580,
-
- /// <summary>
/// 璋冩嫧鍏ュ簱
/// </summary>
[Description("璋冩嫧鍏ュ簱")]
InAllocate = 570,
/// <summary>
- /// 绾胯竟浠撳叆搴�
+ /// MES澶х┖鎵橀��鏂�
/// </summary>
- [Description("绾胯竟浠撳叆搴�")]
- InboundXB = 580,
+ [Description("MES澶х┖鎵橀��鏂�")]
+ MesPalletLargeReturn = 580,
/// <summary>
- /// 鏈哄彴鍏ュ簱
+ /// MES灏忕┖鎵橀��鏂�
/// </summary>
- [Description("鏈哄彴鍏ュ簱")]
- InboundJT = 590,
+ [Description("MES灏忕┖鎵橀��鏂�")]
+ MesPalletSmallReturn = 585,
/// <summary>
/// 绌虹鍏ュ簱
@@ -145,7 +175,21 @@
/// </summary>
[Description("鎴愬搧浣欐枡鍥炲簱")]
InProductBack = 620,
-
+ /// <summary>
+ /// 鎴愬搧绌烘鍥炲簱
+ /// </summary>
+ [Description("鎴愬搧绌烘鍥炲簱")]
+ EmptyProductBack = 630,
+ /// <summary>
+ /// 闃荤剨鍏ュ簱灏忎欢
+ /// </summary>
+ [Description("闃荤剨鍏ュ簱灏忎欢")]
+ InZHProductSmall = 640,
+ /// <summary>
+ /// 闃荤剨鍏ュ簱澶т欢
+ /// </summary>
+ [Description("闃荤剨鍏ュ簱澶т欢")]
+ InZHProductLarge = 645,
/// <summary>
/// 宸烽亾鍐呯Щ搴�
/// </summary>
--
Gitblit v1.9.3