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

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs"
index 904222d..20c0435 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs"
@@ -88,6 +88,32 @@
         /// 鍏朵粬鍏ュ簱鍗�
         /// </summary>
         [Description("鍏朵粬鍏ュ簱鍗�")]
-        Other = 130
+        Other = 130,
+        /// <summary>
+        /// 瀹緵鍥炴敹
+        /// </summary>
+        [Description("瀹緵鍥炴敹")]
+        CustomerRecovery=135,
+        /// <summary>
+        /// 閫佹鍏ュ簱鍗�
+        /// </summary>
+        [Description("閫佹鍏ュ簱鍗�")]
+        Inspect = 140,
+    }
+    /// <summary>
+    /// 鎴愬搧鍏ュ簱鍗曟嵁绫诲瀷
+    /// </summary>
+    public enum ErpProOrderTypeEnum
+    {
+        /// <summary>
+        /// 鎴愬搧璋冩嫧鍏ュ簱鍗�
+        /// </summary>
+        [Description("鎴愬搧璋冩嫧鍏ュ簱鍗�")]
+        ProAllocat =1,
+        /// <summary>
+        /// 鎴愬搧瀵勫敭鍏ュ簱鍗�
+        /// </summary>
+        [Description("鎴愬搧瀵勫敭鍏ュ簱鍗�")]
+        ProConsign = 2,
     }
 }

--
Gitblit v1.9.3