From e2f151957b38d3c02c26be4343b6916d65e800b7 Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期四, 09 一月 2025 13:52:51 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs | 111 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 48 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" index 937e251..a269f80 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" @@ -7,80 +7,95 @@ namespace WIDESEA_Common.TaskEnum { - public enum TaskInboundTypeEnum + public enum TaskTypeEnum { /// <summary> - /// 鍏ュ簱 + /// 棰嗘枡鍑哄簱 /// </summary> - [Description("鍏ュ簱")] - Inbound = 200, - /// <summary> - /// 鐩樼偣鍏ュ簱 - /// </summary> - [Description("鐩樼偣鍏ュ簱")] - InInventory = 201, - /// <summary> - /// 鍒嗘嫞鍏ュ簱 - /// </summary> - [Description("鍒嗘嫞鍏ュ簱")] - InPick = 202, - /// <summary> - /// 璐ㄦ鍏ュ簱 - /// </summary> - [Description("璐ㄦ鍏ュ簱")] - InQuality = 203, - /// <summary> - /// 娴嬭瘯鏋跺叆搴� - /// </summary> - [Description("娴嬭瘯鏋跺叆搴�")] - TestInbound = 204, - } - - public enum TaskOutboundTypeEnum - { - /// <summary> - /// 鍑哄簱 - /// </summary> - [Description("鍑哄簱")] + [Description("棰嗘枡鍑哄簱")] Outbound = 100, /// <summary> /// 鐩樼偣鍑哄簱 /// </summary> [Description("鐩樼偣鍑哄簱")] - OutInventory = 101, + OutInventory = 110, /// <summary> /// 鍒嗘嫞鍑哄簱 /// </summary> [Description("鍒嗘嫞鍑哄簱")] - OutPick = 102, + OutPick = 120, /// <summary> /// 璐ㄦ鍑哄簱 /// </summary> [Description("璐ㄦ鍑哄簱")] - OutQuality = 103, + OutQuality = 130, + /// <summary> - /// 娴嬭瘯鏋跺嚭搴� + /// MES鍑哄簱 /// </summary> - [Description("娴嬭瘯鏋跺嚭搴�")] - OutTestStand = 104, + [Description("MES鍑哄簱")] + MesOutbound = 200, + /// <summary> + /// 閲囪喘鍏ュ簱 + /// </summary> + [Description("閲囪喘鍏ュ簱")] + Inbound = 510, + /// <summary> + /// 鐩樼偣鍏ュ簱 + /// </summary> + [Description("鐩樼偣鍏ュ簱")] + InInventory = 520, + /// <summary> + /// 鍒嗘嫞鍏ュ簱 + /// </summary> + [Description("鍒嗘嫞鍏ュ簱")] + InPick = 530, + /// <summary> + /// 璐ㄦ鍏ュ簱 + /// </summary> + [Description("璐ㄦ鍏ュ簱")] + InQuality = 540, + + /// <summary> + /// 鐢熶骇閫�鏂� + /// </summary> + [Description("鐢熶骇閫�鏂�")] + ProductionReturn = 550, + + /// <summary> + /// MES閫�鏂� + /// </summary> + [Description("MES閫�鏂�")] + MesMatReturn = 560, + + /// <summary> + /// 宸烽亾鍐呯Щ搴� + /// </summary> + [Description("宸烽亾鍐呯Щ搴�")] + Relocation = 900 + } - public enum TaskRelocationTypeEnum + public enum TaskTypeGroup { /// <summary> - /// 搴撳唴绉诲簱 + /// /// </summary> - [Description("搴撳唴绉诲簱")] - Relocation = 300, + InboundGroup, + /// <summary> - /// 搴撳绉诲簱 + /// /// </summary> - [Description("搴撳绉诲簱")] - RelocationIn = 301 - } + OutbondGroup, - public enum TaskOtherTypeEnum - { + /// <summary> + /// + /// </summary> + RelocationGroup, + /// <summary> + /// + /// </summary> + OtherGroup } } -- Gitblit v1.9.3