HIA24016N_PipeLineDemo.git

			@@ -1,3 +1,4 @@
			using CMS.Plugin.PipeLineLems.Domain.Shared.Enums;
			using CmsQueryExtensions.Extension;
			using Volo.Abp.Application.Dtos;

			@@ -52,6 +53,96 @@
			/// 任务编码-查询关系运算符
			/// </summary>
			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; }

			/// <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>
			/// 工艺流向编号
			/// </summary>
			public string ProcessRouteNumber { get; set; }

			/// <summary>
			/// 工艺流向编号-查询关系运算符
			/// </summary>
			public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

			/// <summary>
			/// 原料标识
			@@ -224,24 +315,14 @@
			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.模糊查询;

			/// <summary>
			/// 工序名称
			/// </summary>
			public string ProcessName { get; set; }

			/// <summary>
			/// 工序名称-查询关系运算符
			/// </summary>
			public SearchFilterModeEnum ProcessName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
			public SearchFilterModeEnum ProdLineCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

			/// <summary>
			/// 管件编码
			@@ -262,26 +343,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)
			@@ -314,31 +375,11 @@
			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; }

			/// <summary>
			/// 工艺流向编号-查询关系运算符
			/// </summary>
			public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

			/// <summary>
			/// 计划开始时间
			/// </summary>
			//表示是高级查询范围查询特性
			[HighSearchRangeAttribute]
			public List<string> PlannedStartTime { get; set; }
			public string PlannedStartTime { get; set; }


			/// <summary>
			@@ -346,7 +387,7 @@
			/// </summary>
			//表示是高级查询范围查询特性
			[HighSearchRangeAttribute]
			public List<string> PlannedEndTime { get; set; }
			public string PlannedEndTime { get; set; }


			/// <summary>
			@@ -374,7 +415,7 @@
			/// </summary>
			//表示是高级查询范围查询特性
			[HighSearchRangeAttribute]
			public List<string> CreationTime { get; set; }
			public string CreationTime { get; set; }


			/// <summary>
			@@ -392,7 +433,7 @@
			/// </summary>
			//表示是高级查询范围查询特性
			[HighSearchRangeAttribute]
			public List<string> LastModificationTime { get; set; }
			public string LastModificationTime { get; set; }


			/// <summary>
			@@ -430,7 +471,7 @@
			/// </summary>
			//表示是高级查询范围查询特性
			[HighSearchRangeAttribute]
			public List<string> DeletionTime { get; set; }
			public string DeletionTime { get; set; }


			/// <summary>