From 5d6cb15ac86d9174393cb9d1538d69b567e2c26c Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 09 五月 2024 08:56:50 +0800
Subject: [PATCH] 修改货品编辑bug

---
 CoreCms.Net.Configuration/GlobalEnumVars.cs |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs
index ea958e7..6d4795c 100644
--- a/CoreCms.Net.Configuration/GlobalEnumVars.cs
+++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs
@@ -72,6 +72,8 @@
             鏈嶅姟璁㈠崟缂栧彿 = 10,
             [Description("鏈嶅姟鍒稿厬鎹㈢爜")]
             鏈嶅姟鍒稿厬鎹㈢爜 = 11,
+            [Description("璁″垝璁㈠崟缂栧彿")]
+            璁″垝璁㈠崟缂栧彿 = 12,
         }
         /// <summary>
         /// 鏉ユ簮
@@ -233,6 +235,18 @@
             /// </summary>
             [Description("鏃ュ巻绛惧埌")]
             CheckIn = 10,
+
+            /// <summary>
+            /// 缁忛攢鍟嗕笟缁╂彁鎴�
+            /// </summary>
+            [Description("缁忛攢鍟嗕笟缁╂彁鎴�")]
+            DistributionAchievement = 11,
+
+            /// <summary>
+            /// 璁㈠崟
+            /// </summary>
+            [Description("璁㈠崟")]
+            GoodsOder = 11,
         }
         /// <summary>
         /// 鐢ㄦ埛绉垎鍙樺姩鏉ユ簮绫诲瀷
@@ -647,6 +661,18 @@
             TransactionComponent = 10,
 
         }
+
+        /// <summary>
+        /// 璁″垝璁㈠崟鏄惁鎻愪氦
+        /// </summary>
+        public enum PlanOrderTiJiao
+        {
+            [Description("鏈彁浜�")]
+            鏈彁浜� = 1,
+            [Description("宸叉彁浜�")]
+            鎻愪氦 = 2
+        }
+
         /// <summary>
         /// 鍙戣揣鍗曠姸鎬�
         /// </summary>
@@ -2294,7 +2320,7 @@
 
         #region 鍒嗛攢璁剧疆
         /// <summary>
-        /// 鍒嗛攢鍟嗙敵璇峰鏍哥姸鎬�
+        /// 缁忛攢鍟嗙敵璇峰鏍哥姸鎬�
         /// </summary>
         public enum DistributionVerifyStatus
         {
@@ -2313,9 +2339,15 @@
             /// </summary>
             [Description("瀹℃牳鎷掔粷")]
             VerifyRefuse = 3,
+
+            /// <summary>
+            /// 瀹℃牳鎷掔粷
+            /// </summary>
+            [Description("鍙栨秷璧勬牸")]
+            VerifyCancel = 4,
         }
         /// <summary>
-        /// 鍒嗛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
+        /// 缁忛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
         /// </summary>
 
         public enum DistributionOrderSettlementStatus
@@ -2431,7 +2463,7 @@
         }
 
         /// <summary>
-        /// 鎴愪负鍒嗛攢鍟嗘潯浠�
+        /// 鎴愪负缁忛攢鍟嗘潯浠�
         /// </summary>
         public enum DistributionConditionType
         {

--
Gitblit v1.9.1