From 0705cb6170a9ba77ba48bbb6dcebb9cf3d73cbea Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 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..6089636 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"
@@ -85,9 +85,43 @@
EmptyDisk = 125,
/// <summary>
- /// 鍏朵粬鍏ュ簱鍗�
+ /// 缁翠慨閫�鏂欏崟
/// </summary>
- [Description("鍏朵粬鍏ュ簱鍗�")]
- Other = 130
+ [Description("缁翠慨閫�鏂欏崟")]
+ RMStock = 130,
+
+ /// <summary>
+ /// 瀹緵鍥炴敹
+ /// </summary>
+ [Description("瀹緵鍥炴敹")]
+ CustomerRecovery=135,
+
+ /// <summary>
+ /// 閫佹鍏ュ簱鍗�
+ /// </summary>
+ [Description("閫佹鍏ュ簱鍗�")]
+ Inspect = 140,
+
+ /// <summary>
+ /// Bom閫�鏂欏崟
+ /// </summary>
+ [Description("Bom閫�鏂欏崟")]
+ BomReturn = 145,
+ }
+ /// <summary>
+ /// 鎴愬搧鍏ュ簱鍗曟嵁绫诲瀷
+ /// </summary>
+ public enum ErpProOrderTypeEnum
+ {
+ /// <summary>
+ /// 鎴愬搧璋冩嫧鍏ュ簱鍗�
+ /// </summary>
+ [Description("鎴愬搧璋冩嫧鍏ュ簱鍗�")]
+ ProAllocat =1,
+ /// <summary>
+ /// 鎴愬搧瀵勫敭鍏ュ簱鍗�
+ /// </summary>
+ [Description("鎴愬搧瀵勫敭鍏ュ簱鍗�")]
+ ProConsign = 2,
}
}
--
Gitblit v1.9.3