From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端，pda，后端接口更改，新增，优化
---
WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs | 258 +++++++++++++++++++++++++++++++++------------------
1 files changed, 165 insertions(+), 93 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs
index 9d49f5e..215bac6 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs
@@ -7,6 +7,142 @@
namespace WIDESEA_Core.Enums
{
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ public enum OrderTypeEnum
+ {
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鍗�
+ /// </summary>
+ [Description("鐢熶骇鍏ュ簱鍗�")]
+ 鐢熶骇鍏ュ簱鍗� = 0,
+
+ /// <summary>
+ /// 鐢熶骇鍑哄簱鍗�
+ /// </summary>
+ [Description("鐢熶骇鍑哄簱鍗�")]
+ 鐢熶骇鍑哄簱鍗� = 1,
+
+ /// <summary>
+ /// 璋冩嫧鍏ュ簱鍗�
+ /// </summary>
+ [Description("璋冩嫧鍏ュ簱鍗�")]
+ 璋冩嫧鍏ュ簱鍗� = 2,
+
+ /// <summary>
+ /// 璋冩嫧鍑哄簱鍗�
+ /// </summary>
+ [Description("璋冩嫧鍑哄簱鍗�")]
+ 璋冩嫧鍑哄簱鍗� = 3,
+ /// <summary>
+ /// 浣欐枡鍥炲簱鍗�
+ /// </summary>
+ [Description("浣欐枡鍥炲簱鍗�")]
+ 浣欐枡鍥炲簱鍗� = 4,
+
+ /// <summary>
+ /// 鍙嶆嫞鍥炲簱鍗�
+ /// </summary>
+ [Description("鍙嶆嫞鍥炲簱鍗�")]
+ 鍙嶆嫞鍥炲簱鍗� = 5,
+
+ /// <summary>
+ /// 鍙嶆嫞鍑哄簱鍗�
+ /// </summary>
+ [Description("鍙嶆嫞鍑哄簱鍗�")]
+ 鍙嶆嫞鍑哄簱鍗� = 6,
+
+ }
+ /// <summary>
+ /// 鍗曟嵁澶х被
+ /// </summary>
+ public enum InoutTypeEnum
+ {
+ /// <summary>
+ /// 閲囪喘鍏ュ簱
+ /// </summary>
+ [Description("閲囪喘鍏ュ簱")]
+ PurchaseIn,
+
+ /// <summary>
+ /// 鎴愬搧鍏ュ簱
+ /// </summary>
+ [Description("鎴愬搧鍏ュ簱")]
+ Finished,
+
+ /// <summary>
+ /// 鍗婃垚鍝佸叆搴�
+ /// </summary>
+ [Description("鍗婃垚鍝佸叆搴�")]
+ PartedIn,
+
+ /// <summary>
+ /// 鐢熶骇閫�鏂�
+ /// </summary>
+ [Description("鐢熶骇閫�鏂�")]
+ MaterialReturn,
+ /// <summary>
+ /// 閿�鍞��璐�
+ /// </summary>
+ [Description("閿�鍞��璐�")]
+ SaleReturn,
+
+ /// <summary>
+ /// 鍏朵粬鍏ュ簱
+ /// </summary>
+ [Description("鍏朵粬鍏ュ簱")]
+ OtherIn,
+
+ /// <summary>
+ /// 閿�鍞嚭搴�
+ /// </summary>
+ [Description("閿�鍞嚭搴�")]
+ SaleOut,
+
+ /// <summary>
+ /// 宸ュ崟鍙戞枡
+ /// </summary>
+ [Description("宸ュ崟鍙戞枡")]
+ WorkFeed,
+
+ /// <summary>
+ /// 鎻愪粨杩旀
+ /// </summary>
+ [Description(" 鎻愪粨杩旀")]
+ OutToCheck,
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱
+ /// </summary>
+ [Description("鍏朵粬鍑哄簱")]
+ OtherOut,
+
+ /// <summary>
+ /// 渚涘簲鍟嗛��璐�
+ /// </summary>
+ [Description("渚涘簲鍟嗛��璐�")]
+ SupplierReturn,
+
+ /// <summary>
+ /// 涓ゆ璋冩嫧
+ /// </summary>
+ [Description("涓ゆ璋冩嫧")]
+ TwoAllocate,
+ /// <summary>
+ /// 搴撳瓨璋冩暣
+ /// </summary>
+ [Description("搴撳瓨璋冩暣")]
+ InventoryAdjust,
+
+ /// <summary>
+ /// 鏍囧噯鐩樼偣
+ /// </summary>
+ [Description("鏍囧噯鐩樼偣")]
+ StandardCount,
+ }
+
/// <summary>
/// 鍏ュ簱鍗曠被鍨� 100 鐢熶骇鍏ュ簱鍗�;200 鐢熶骇閫�鏂欏崟;300 閲囪喘鍏ュ簱鍗�;400 璋冩嫧鍏ュ簱鍗�;500 閿�鍞��璐у崟;600 绌虹洏鍏ュ簱鍗�;700 鍏朵粬鍏ュ簱鍗�
/// </summary>
@@ -59,7 +195,6 @@
[Description("鐩樼偣鍏ュ簱")]
InInventory = 135
}
-
/// <summary>
/// 鍑哄簱鍗曠被鍨�
/// </summary>
@@ -75,6 +210,11 @@
/// </summary>
[Description("鐢熶骇鍏ュ簱鍗�")]
outwork = 1,
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鍗�
+ /// </summary>
+ [Description("鐢熶骇鍏ュ簱鍗�")]
+ works = 2,
/// <summary>
/// 鐢熶骇杩斿伐鍗�
/// </summary>
@@ -143,6 +283,11 @@
/// </summary>
[Description("缁勭洏鍏ュ簱")]
GroupAndInbound = 10,
+ /// <summary>
+ /// 鍏ュ簱涓�
+ /// </summary>
+ [Description("鍏ュ簱涓�")]
+ Inbounding = 20,
[Description("鍑哄簱閮ㄥ垎鍒嗛厤瀹屾垚")]
AssignOverPartial = 60,
@@ -156,7 +301,7 @@
/// 瀹屾垚
/// </summary>
[Description("瀹屾垚")]
- Over=100
+ Over = 100
}
#region 鍘熷鍗曟嵁鍚屾鐘舵��
@@ -240,13 +385,13 @@
/// 鍑哄簱涓�
/// </summary>
[Description("鍑哄簱涓�")]
- 鍏ュ簱涓� = 1,
+ 鍑哄簱涓� = 1,
/// <summary>
/// 鍑哄簱瀹屾垚
/// </summary>
[Description("鍑哄簱瀹屾垚")]
- 鍏ュ簱瀹屾垚 = 2,
+ 鍑哄簱瀹屾垚 = 2,
/// <summary>
/// 鍏抽棴
@@ -279,107 +424,34 @@
daoru
}
- #region 搴撳瓨鐘舵��
-
- /// <summary>
- /// 搴撳瓨鐘舵�侊細 1锛岀粍鐩樻殏瀛� 2锛岀粍鐩樻挙閿� 3锛屽叆搴撶‘璁� 4锛屽叆搴撴挙閿� 5锛屽凡鍏ュ簱 6锛屽凡鍑哄簱
- /// </summary>
- public enum StockStateEmun
- {
- 缁勭洏鏆傚瓨 = 1,
- 鍏ュ簱瀹屾垚 = 2,
- 鍑哄簱閿佸畾 = 3,
- 鍑哄簱瀹屾垚 = 4,
- }
-
- #endregion 搴撳瓨鐘舵��
-
public enum OrderTypeEmun
{
- [Description("鍘熸潗鏂�")]
- 鍘熸潗鏂� = 1,
- [Description("鎴愬搧鏂�")]
- 鎴愬搧鏂� = 2,
+ //[Description("鍘熸潗鏂�")]
+ //鍘熸潗鏂� = 1,
+ //[Description("鎴愬搧鏂�")]
+ //鎴愬搧鏂� = 2,
/// <summary>
- /// 閲囪喘鍏ュ簱
+ /// 鍏ュ簱
/// </summary>
- [Description("閲囪喘鍏ュ簱")]
- PurchaseIn,
+ [Description("鍏ュ簱")]
+ 鍏ュ簱 = 0,
/// <summary>
- /// 鎴愬搧鍏ュ簱
+ /// 鍑哄簱
/// </summary>
- [Description("鎴愬搧鍏ュ簱")]
- Finished,
+ [Description("鍑哄簱")]
+ 鍑哄簱 = 1,
/// <summary>
- /// 鍗婃垚鍝佸叆搴�
+ /// 璋冩嫧鍏ュ簱
/// </summary>
- [Description("鍗婃垚鍝佸叆搴�")]
- PartedIn,
+ [Description("璋冩嫧鍏ュ簱")]
+ 璋冩嫧鍏ュ簱 = 2,
/// <summary>
- /// 鐢熶骇閫�鏂�
+ /// 璋冩嫧鍑哄簱
/// </summary>
- [Description("鐢熶骇閫�鏂�")]
- MaterialReturn,
-
- /// <summary>
- /// 閿�鍞��璐�
- /// </summary>
- [Description("閿�鍞��璐�")]
- SaleReturn,
-
- /// <summary>
- /// 鍏朵粬鍏ュ簱
- /// </summary>
- [Description("鍏朵粬鍏ュ簱")]
- OtherIn,
-
- /// <summary>
- /// 閿�鍞嚭搴�
- /// </summary>
- [Description("閿�鍞嚭搴�")]
- SaleOut,
- /// <summary>
- /// 宸ュ崟鍙戞枡
- /// </summary>
- [Description("宸ュ崟鍙戞枡")]
- WorkFeed,
-
- /// <summary>
- /// 鎻愪粨杩旀
- /// </summary>
- [Description("鎻愪粨杩旀")]
- OutToCheck,
- /// <summary>
- /// 鍏朵粬鍑哄簱
- /// </summary>
- [Description("鍏朵粬鍑哄簱")]
- OtherOut,
-
- /// <summary>
- /// 渚涘簲鍟嗛��璐�
- /// </summary>
- [Description(" 渚涘簲鍟嗛��璐�")]
- SupplierReturn,
-
- /// <summary>
- /// 涓ゆ璋冩嫧
- /// </summary>
- [Description("涓ゆ璋冩嫧")]
- TwoAllocate,
-
- /// <summary>
- /// 搴撳瓨璋冩暣
- /// </summary>
- [Description("搴撳瓨璋冩暣")]
- InventoryAdjust,
-
- /// <summary>
- /// 鏍囧噯鐩樼偣
- /// </summary>
- [Description("鏍囧噯鐩樼偣")]
- StandardCount,
+ [Description("璋冩嫧鍑哄簱")]
+ 璋冩嫧鍑哄簱 = 3,
}
}
--
Gitblit v1.9.3