From 0ab314db5c1b0e87f671c382cc6509c13177ae0c Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 20 5月 2025 17:03:17 +0800 Subject: [PATCH] 22 --- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs index 8d2fe5b..91a608e 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs @@ -29,6 +29,7 @@ { get { + if (TaskType == 0) return ""; return GetEnumDescriptionUtil.GetEnumDescription(TaskType); } } @@ -49,6 +50,7 @@ { get { + if (TaskStatus == 0) return ""; return GetEnumDescriptionUtil.GetEnumDescription(TaskStatus); } } @@ -67,6 +69,12 @@ /// </summary> public string? ToPlace { get; set; } + + /// <summary> + /// PLC浠诲姟鍙� + /// </summary> + public int PlcTaskId { get; set; } + /// <summary> /// 宸烽亾 /// </summary> @@ -80,12 +88,36 @@ /// <summary> /// 璁惧绫诲瀷 /// </summary> - public int Dodevicetype { get; set; } + public DodevicetypeEnum Dodevicetype { get; set; } + + /// <summary> + /// 璁惧绫诲瀷Desc + /// </summary> + public string DodevicetypeDesc + { + get + { + if (Dodevicetype == 0) return ""; + return GetEnumDescriptionUtil.GetEnumDescription(Dodevicetype); + } + } /// <summary> /// 璁惧浠诲姟鐘舵�� /// </summary> - public int TaskDodeviceStatus { get; set; } + public TaskDodeviceStatus TaskDodeviceStatus { get; set; } + + /// <summary> + /// 璁惧绫诲瀷Desc + /// </summary> + public string TaskDodeviceStatusDesc + { + get + { + if (TaskDodeviceStatus == 0) return ""; + return GetEnumDescriptionUtil.GetEnumDescription(TaskDodeviceStatus); + } + } /// <summary> /// WCS鏄惁鍙互璇诲彇 @@ -104,6 +136,7 @@ { get { + if (SonTaskType == 0 || !SonTaskType.HasValue) return ""; return GetEnumDescriptionUtil.GetEnumDescription(SonTaskType); } } -- Gitblit v1.9.3