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

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 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 cfe9fdd..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,16 +67,19 @@
         /// </summary>
         [Description("鎴愬搧鍑哄簱")]
         OutProduct = 230,
+
         /// <summary>
         /// 鎴愬搧瀵勫敭鍑哄簱
         /// </summary>
         [Description("鎴愬搧瀵勫敭鍑哄簱")]
         OutSendProduct = 240,
+
         /// <summary>
-        /// 鎴愬搧MES鍑哄簱/鎻愬簱
+        /// 鎴愬搧MES鎻愬簱
         /// </summary>
         [Description("鎴愬搧MES鎻愬簱")]
         OutMesRworkProduct = 250,
+
         /// <summary>
         /// 闃茬剨鍓嶆淳宸ュ皬浠�
         /// </summary>
@@ -82,6 +91,7 @@
         /// </summary>
         [Description("闃茬剨鍓嶆淳宸ュぇ浠�")]
         MaskOutNoticeLarge = 265,
+
         /// <summary>
         /// 闃茬剨鍒扮嚎杈瑰皬浠�
         /// </summary>
@@ -93,21 +103,25 @@
         /// </summary>
         [Description("闃茬剨鍒扮嚎杈瑰ぇ浠�")]
         MaskOutLarge = 275,
+
         /// <summary>
         /// 閲囪喘鍏ュ簱
         /// </summary>
         [Description("閲囪喘鍏ュ簱")]
         Inbound = 510,
+
         /// <summary>
         /// 鐩樼偣鍏ュ簱
         /// </summary>
         [Description("鐩樼偣鍏ュ簱")]
         InInventory = 520,
+
         /// <summary>
         /// 鍒嗘嫞鍏ュ簱
         /// </summary>
         [Description("鍒嗘嫞鍏ュ簱")]
         InPick = 530,
+
         /// <summary>
         /// 璐ㄦ鍏ュ簱
         /// </summary>
@@ -127,6 +141,12 @@
         MesMatReturn = 560,
 
         /// <summary>
+        /// 璋冩嫧鍏ュ簱
+        /// </summary>
+        [Description("璋冩嫧鍏ュ簱")]
+        InAllocate = 570,
+
+        /// <summary>
         /// MES澶х┖鎵橀��鏂�
         /// </summary>
         [Description("MES澶х┖鎵橀��鏂�")]
@@ -137,24 +157,6 @@
         /// </summary>
         [Description("MES灏忕┖鎵橀��鏂�")]
         MesPalletSmallReturn = 585,
-
-        /// <summary>
-        /// 璋冩嫧鍏ュ簱
-        /// </summary>
-        [Description("璋冩嫧鍏ュ簱")]
-        InAllocate = 570,
-
-        /// <summary>
-        /// 绾胯竟浠撳叆搴�
-        /// </summary>
-        [Description("绾胯竟浠撳叆搴�")]
-        InboundXB = 580,
-
-        /// <summary>
-        /// 鏈哄彴鍏ュ簱
-        /// </summary>
-        [Description("鏈哄彴鍏ュ簱")]
-        InboundJT = 590,
 
         /// <summary>
         /// 绌虹鍏ュ簱

--
Gitblit v1.9.3