From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
index 6698721..f0c5ab9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
@@ -97,7 +97,7 @@
         /// <summary>
         /// 閲囪喘鍏ュ簱
         /// </summary>
-        [Description("閲囪喘鍏ュ簱")]
+        [Description("鍏ュ簱")]
         Inbound = 510,
         /// <summary>
         /// 鐩樼偣鍏ュ簱
@@ -133,6 +133,11 @@
         [Description("璋冩嫧鍏ュ簱")]
         InAllocate = 570,
         /// <summary>
+        /// 鏅轰粨鍏ユ櫤浠�
+        /// </summary>
+        [Description("鏅轰粨鍏ユ櫤浠�")]
+        AllocateInWarehouse = 580,
+        /// <summary>
         /// 绌虹鍏ュ簱
         /// </summary>
         [Description("绌虹鍏ュ簱")]
@@ -142,8 +147,20 @@
         /// 宸烽亾鍐呯Щ搴�
         /// </summary>
         [Description("宸烽亾鍐呯Щ搴�")]
-        Relocation = 900
-        
+        Relocation = 900,
+
+        /// <summary>
+        /// 鍚屽尯鍩熺Щ搴�
+        /// </summary>
+        [Description("鍚屽尯鍩熺Щ搴�")]
+        AreaRelocation = 910,
+
+        /// <summary>
+        /// 璺ㄥ尯鍩熺Щ搴�
+        /// </summary>
+        [Description("璺ㄥ尯鍩熺Щ搴�")]
+        CrossAreaRelocation = 920
+
     }
 
     public enum TaskTypeGroup

--
Gitblit v1.9.3