From d13e6e7d5df05ba244971d2fabb788ccb0f5c12a Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 27 一月 2026 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu
---
WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs
index e97c542..0ba2f05 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs
@@ -36,6 +36,29 @@
/// </summary>
[Description("璋冩嫧鍑哄簱鍗�")]
璋冩嫧鍑哄簱鍗� = 3,
+ /// <summary>
+ /// 浣欐枡鍥炲簱鍗�
+ /// </summary>
+ [Description("浣欐枡鍥炲簱鍗�")]
+ 浣欐枡鍥炲簱鍗� = 4,
+
+ /// <summary>
+ /// 鍙嶆嫞鍥炲簱鍗�
+ /// </summary>
+ [Description("鍙嶆嫞鍥炲簱鍗�")]
+ 鍙嶆嫞鍥炲簱鍗� = 5,
+
+ /// <summary>
+ /// 鍙嶆嫞鍑哄簱鍗�
+ /// </summary>
+ [Description("鍙嶆嫞鍑哄簱鍗�")]
+ 鍙嶆嫞鍑哄簱鍗� = 6,
+
+ /// <summary>
+ /// 鐩樼偣鍥炲簱鍗�
+ /// </summary>
+ [Description("鐩樼偣鍥炲簱鍗�")]
+ 鐩樼偣鍥炲簱鍗� = 7,
}
/// <summary>
@@ -60,7 +83,11 @@
/// </summary>
[Description("鍗婃垚鍝佸叆搴�")]
PartedIn,
-
+ /// <summary>
+ /// 璋冩嫧鍏ュ簱
+ /// </summary>
+ [Description("璋冩嫧鍏ュ簱")]
+ AllocateIn,
/// <summary>
/// 鐢熶骇閫�鏂�
/// </summary>
@@ -118,7 +145,7 @@
/// </summary>
[Description("搴撳瓨璋冩暣")]
InventoryAdjust,
-
+
/// <summary>
/// 鏍囧噯鐩樼偣
/// </summary>
@@ -368,13 +395,13 @@
/// 鍑哄簱涓�
/// </summary>
[Description("鍑哄簱涓�")]
- 鍏ュ簱涓� = 1,
+ 鍑哄簱涓� = 1,
/// <summary>
/// 鍑哄簱瀹屾垚
/// </summary>
[Description("鍑哄簱瀹屾垚")]
- 鍏ュ簱瀹屾垚 = 2,
+ 鍑哄簱瀹屾垚 = 2,
/// <summary>
/// 鍏抽棴
@@ -406,21 +433,6 @@
[Description("瀵煎叆")]
daoru
}
-
- #region 搴撳瓨鐘舵��
-
- /// <summary>
- /// 搴撳瓨鐘舵�侊細 1锛岀粍鐩樻殏瀛� 2锛岀粍鐩樻挙閿� 3锛屽叆搴撶‘璁� 4锛屽叆搴撴挙閿� 5锛屽凡鍏ュ簱 6锛屽凡鍑哄簱
- /// </summary>
- public enum StockStateEmun
- {
- 缁勭洏鏆傚瓨 = 1,
- 鍏ュ簱瀹屾垚 = 2,
- 鍑哄簱閿佸畾 = 3,
- 鍑哄簱瀹屾垚 = 4,
- }
-
- #endregion 搴撳瓨鐘舵��
public enum OrderTypeEmun
{
--
Gitblit v1.9.3