From 2f14ad3cc01d575bfde0850bae05fded8acb7af6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 12 一月 2025 00:20:26 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
index 86bbdf2..fa3067a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
@@ -23,14 +23,8 @@
         [Description("缁勭洏鏆傚瓨")]
         缁勭洏鏆傚瓨 = 1,
 
-        [Description("缁勭洏鎾ら攢")]
-        缁勭洏鎾ら攢 = 2,
-
         [Description("鍏ュ簱纭")]
         鍏ュ簱纭 = 3,
-
-        [Description("鍏ュ簱鎾ら攢")]
-        鍏ュ簱鎾ら攢 = 4,
 
         [Description("鍏ュ簱瀹屾垚")]
         鍏ュ簱瀹屾垚 = 6,
@@ -49,5 +43,20 @@
 
         [Description("閫�搴�")]
         閫�搴� = 11,
+
+        [Description("鎵嬪姩缁勭洏鏆傚瓨")]
+        鎵嬪姩缁勭洏鏆傚瓨 = 12,
+
+        [Description("鎵嬪姩缁勭洏鍏ュ簱纭")]
+        鎵嬪姩缁勭洏鍏ュ簱纭 = 13,
+
+        [Description("鎷i�夊畬鎴�")]
+        鎷i�夊畬鎴� =14,
+
+        [Description("缁勭洏鎾ら攢")]
+        缁勭洏鎾ら攢 = 99,
+
+        [Description("鍏ュ簱鎾ら攢")]
+        鍏ュ簱鎾ら攢 = 199,
     }
 }

--
Gitblit v1.9.3