From 9796651f30deb9eee38c9d846255b293fbba15eb Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周五, 16 5月 2025 09:26:55 +0800 Subject: [PATCH] 333 --- PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs | 69 +++++++++++++++++++++++++--------- 1 files changed, 50 insertions(+), 19 deletions(-) diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs index e97ec45..55d440c 100644 --- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs +++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs @@ -1,3 +1,4 @@ +using CMS.Plugin.PipeLineLems.Domain.Shared.Enums; using CmsQueryExtensions.Extension; using Volo.Abp.Application.Dtos; @@ -52,6 +53,26 @@ /// 浠诲姟缂栫爜-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> public SearchFilterModeEnum TaskCode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 璁″垝鐘舵�� + /// </summary> + public WorkPlanStatusEnum? WorkPlanStatus { get; set; } + + /// <summary> + /// 璁″垝鐘舵��-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum WorkPlanStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> + /// 鍙枡鐘舵�� + /// </summary> + public CallMaterialStatusEnum? CallMaterialStatus { get; set; } + + /// <summary> + /// 鍙枡鐘舵��-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum CallMaterialStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; /// <summary> /// 鍘熸枡鏍囪瘑 @@ -224,14 +245,34 @@ public SearchFilterModeEnum EquipmentCode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> - /// 宸ヤ欢鍚嶇О + /// 浜х嚎缂栫爜 /// </summary> - public string WorkpieceName { get; set; } + public string ProdLineCode { get; set; } /// <summary> - /// 宸ヤ欢鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� + /// 浜х嚎缂栫爜-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> - public SearchFilterModeEnum WorkpieceName_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + public SearchFilterModeEnum ProdLineCode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 鑸瑰彿 + /// </summary> + public string ShipNumber { get; set; } + + /// <summary> + /// 鑸瑰彿-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum ShipNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 椤圭洰鍙� + /// </summary> + public string ProjectNumber { get; set; } + + /// <summary> + /// 椤圭洰鍙�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum ProjectNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 宸ュ簭鍚嶇О @@ -314,16 +355,6 @@ public SearchFilterModeEnum Material_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> - /// 鏄惁涓绘敮绠� - /// </summary> - public bool? HasMainSignature { get; set; } - - /// <summary> - /// 鏄惁涓绘敮绠�-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum HasMainSignature_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; - - /// <summary> /// 宸ヨ壓娴佸悜缂栧彿 /// </summary> public string ProcessRouteNumber { get; set; } @@ -338,7 +369,7 @@ /// </summary> //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� [HighSearchRangeAttribute] - public List<string> PlannedStartTime { get; set; } + public string PlannedStartTime { get; set; } /// <summary> @@ -346,7 +377,7 @@ /// </summary> //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� [HighSearchRangeAttribute] - public List<string> PlannedEndTime { get; set; } + public string PlannedEndTime { get; set; } /// <summary> @@ -374,7 +405,7 @@ /// </summary> //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� [HighSearchRangeAttribute] - public List<string> CreationTime { get; set; } + public string CreationTime { get; set; } /// <summary> @@ -392,7 +423,7 @@ /// </summary> //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� [HighSearchRangeAttribute] - public List<string> LastModificationTime { get; set; } + public string LastModificationTime { get; set; } /// <summary> @@ -430,7 +461,7 @@ /// </summary> //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� [HighSearchRangeAttribute] - public List<string> DeletionTime { get; set; } + public string DeletionTime { get; set; } /// <summary> -- Gitblit v1.9.3