From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001 From: helongyang <647556386@qq.com> Date: 星期日, 22 六月 2025 11:44:43 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs | 69 +++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 2 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs" index ee801e7..440cda1 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs" @@ -21,8 +21,73 @@ [Description("宸叉")] Checked = 1 } + public enum CheckAcceptEnum + { + /// <summary> + /// 寰呮纭 + /// </summary> + [Description("寰呮纭")] + NotCheckAccept =0, + /// <summary> + /// 鎺ュ彈 + /// </summary> + [Description("鎺ュ彈")] + Accept=1, + /// <summary> + /// 涓嶆帴鍙� + /// </summary> + [Description("涓嶆帴鍙�")] + UnAccept=2, + } + /// <summary> + /// + /// </summary> + public enum InspectAcceptEnum + { + /// <summary> + /// 寰呮纭 + /// </summary> + [Description("寰呮纭")] + NotCheckAccept = 0, + /// <summary> + /// 鎺ュ彈 + /// </summary> + [Description("鎺ュ彈")] + Accept = 1, + + /// <summary> + /// 涓嶆帴鍙� + /// </summary> + [Description("涓嶆帴鍙�")] + UnAccept = 2, + /// <summary> + /// 鐗归噰鎺ュ彈 + /// </summary> + [Description("鐗归噰鎺ュ彈")] + DefectAccept = 3 + } public enum CheckResultEnum + { + /// <summary> + /// 閫�璐� + /// </summary> + [Description("閫�璐�")] + Return, + + ///// <summary> + ///// 鐗归噰 + ///// </summary> + //[Description("鐗归噰")] + //Defect, + + ///// <summary> + ///// 鎶ュ簾 + ///// </summary> + //[Description("鎶ュ簾")] + //Scrapped + } + public enum InspectResultEnum { /// <summary> /// 閫�璐� @@ -51,11 +116,11 @@ /// 鏈笂浼� /// </summary> [Description("鏈笂浼�")] - UploadNo, + UploadNo=0, /// <summary> /// 宸蹭笂浼� /// </summary> [Description("宸蹭笂浼�")] - UploadOk + UploadOk=1 } } -- Gitblit v1.9.3