From d11b1f9c98e8765d3cee15abd4474b0e05a5acbc Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 01 三月 2025 10:33:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 add9188..10bd4e9 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"
@@ -35,6 +35,11 @@
         [Description("绌虹鍑哄簱")]
         OutEmpty = 140,
         /// <summary>
+        /// 璋冩嫧鍑哄簱
+        /// </summary>
+        [Description("璋冩嫧鍑哄簱")]
+        OutAllocate = 150,
+        /// <summary>
         /// MES鍑哄簱
         /// </summary>
         [Description("MES鍑哄簱")]
@@ -86,6 +91,18 @@
         MesMatReturn = 560,
 
         /// <summary>
+        /// MES绌烘墭閫�鏂�
+        /// </summary>
+        [Description("MES绌烘墭閫�鏂�")]
+        MesPalletReturn = 580,
+
+        /// <summary>
+        /// 璋冩嫧鍏ュ簱
+        /// </summary>
+        [Description("璋冩嫧鍏ュ簱")]
+        InAllocate = 570,
+
+        /// <summary>
         /// 绾胯竟浠撳叆搴�
         /// </summary>
         [Description("绾胯竟浠撳叆搴�")]

--
Gitblit v1.9.3