From 8944412929ca57bf921d4dd12f419778bd6cce62 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 14 5月 2025 16:19:05 +0800 Subject: [PATCH] 任务管理高级查询 --- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs index 973d40a..6ed6df2 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs @@ -1,10 +1,11 @@ +using CMS.Plugin.HIAWms.Domain.Shared.Enums; using CmsQueryExtensions.Extension; using Volo.Abp.Application.Dtos; namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask; /// <summary> -/// Wms浠诲姟绠$悊鏌ヨ鍙傛暟 +/// 浠诲姟绠$悊鏌ヨ鍙傛暟 /// </summary> public class GetWmsTaskInput : ExtensiblePagedAndSortedResultRequestDto { @@ -48,20 +49,15 @@ /// </summary> public string TaskNo { get; set; } - /// <summary> - /// PLC浠诲姟鍙� - /// </summary> - public int PlcTaskId { get; set; } - - /// <summary> - /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 浠诲姟绫诲瀷 /// </summary> - public int? TaskType { get; set; } + public TaskTypeEnum? TaskType { get; set; } /// <summary> /// 浠诲姟绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗� @@ -81,7 +77,7 @@ /// <summary> /// 浠诲姟鐘舵�� /// </summary> - public int? TaskStatus { get; set; } + public WmsTaskStatus? TaskStatus { get; set; } /// <summary> /// 浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗� @@ -119,6 +115,16 @@ public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> + /// + /// </summary> + public int? PlcTaskId { get; set; } + + /// <summary> + /// -鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum PlcTaskId_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> /// 宸烽亾 /// </summary> public int? Aisle { get; set; } @@ -141,7 +147,7 @@ /// <summary> /// 璁惧绫诲瀷 /// </summary> - public int? Dodevicetype { get; set; } + public DodevicetypeEnum? Dodevicetype { get; set; } /// <summary> /// 璁惧绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗� @@ -151,7 +157,7 @@ /// <summary> /// 璁惧浠诲姟鐘舵�� /// </summary> - public int? TaskDodeviceStatus { get; set; } + public TaskDodeviceStatus? TaskDodeviceStatus { get; set; } /// <summary> /// 璁惧浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗� @@ -171,7 +177,7 @@ /// <summary> /// 瀛愪换鍔$被鍨� /// </summary> - public int? SonTaskType { get; set; } + public SonTaskTypeEnum? SonTaskType { get; set; } /// <summary> /// 瀛愪换鍔$被鍨�-鏌ヨ鍏崇郴杩愮畻绗� @@ -249,11 +255,11 @@ public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; /// <summary> - /// + /// 鍒涘缓鏃堕棿 /// </summary> //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� [HighSearchRangeAttribute] - public List<string> CreationTime { get; set; } + public string CreationTime { get; set; } /// <summary> @@ -271,7 +277,7 @@ /// </summary> //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� [HighSearchRangeAttribute] - public List<string> LastModificationTime { get; set; } + public string LastModificationTime { get; set; } /// <summary> @@ -309,7 +315,7 @@ /// </summary> //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� [HighSearchRangeAttribute] - public List<string> DeletionTime { get; set; } + public string DeletionTime { get; set; } -- Gitblit v1.9.3