From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 04 6月 2025 17:42:13 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs | 130 +++++++++++++++++++++++-------------------- 1 files changed, 70 insertions(+), 60 deletions(-) diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs index e0248d3..b502565 100644 --- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs +++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/GetWorkTaskInput.cs @@ -65,6 +65,66 @@ public SearchFilterModeEnum TaskCode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> + /// 绠℃缂栫爜 + /// </summary> + public string PipeSpecCode { get; set; } + + /// <summary> + /// 绠℃缂栫爜-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 绠℃鍚嶇О + /// </summary> + public string PipeSectionName { get; set; } + + /// <summary> + /// 绠℃鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 绠℃鍨嬪彿 + /// </summary> + public string PipeSpecMode { get; set; } + + /// <summary> + /// 绠℃鍨嬪彿-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum PipeSpecMode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 宸ュ簭鍚嶇О + /// </summary> + public string ProcessName { get; set; } + + /// <summary> + /// 宸ュ簭鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum ProcessName_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> /// 璁″垝鐘舵�� /// </summary> public WorkPlanStatusEnum? WorkPlanStatus { get; set; } @@ -83,6 +143,16 @@ /// 鍙枡鐘舵��-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> public SearchFilterModeEnum CallMaterialStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> + /// 宸ヨ壓娴佸悜缂栧彿 + /// </summary> + public string ProcessRouteNumber { get; set; } + + /// <summary> + /// 宸ヨ壓娴佸悜缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 鍘熸枡鏍囪瘑 @@ -265,36 +335,6 @@ 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> - /// 宸ュ簭鍚嶇О - /// </summary> - public string ProcessName { get; set; } - - /// <summary> - /// 宸ュ簭鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum ProcessName_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> /// 绠′欢缂栫爜 /// </summary> public string PipeFittingCode { get; set; } @@ -313,26 +353,6 @@ /// 椤哄簭鍙�-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> public SearchFilterModeEnum PreSerialNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 绠℃缂栫爜 - /// </summary> - public string PipeSpecCode { get; set; } - - /// <summary> - /// 绠℃缂栫爜-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 绠℃鍚嶇О - /// </summary> - public string PipeSectionName { get; set; } - - /// <summary> - /// 绠℃鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 澶栧緞(mm) @@ -363,16 +383,6 @@ /// 鏉愯川-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> public SearchFilterModeEnum Material_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 宸ヨ壓娴佸悜缂栧彿 - /// </summary> - public string ProcessRouteNumber { get; set; } - - /// <summary> - /// 宸ヨ壓娴佸悜缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 璁″垝寮�濮嬫椂闂� -- Gitblit v1.9.3