diff --git a/RIZO.Model/Mes/Dto/ProductionPreparation/QualityControlDto.cs b/RIZO.Model/Mes/Dto/ProductionPreparation/QualityControlDto.cs index ae74494..1b575ad 100644 --- a/RIZO.Model/Mes/Dto/ProductionPreparation/QualityControlDto.cs +++ b/RIZO.Model/Mes/Dto/ProductionPreparation/QualityControlDto.cs @@ -6,7 +6,9 @@ namespace RIZO.Model.Mes.Dto.ProductionPreparation /// public class QualityControlQueryDto : PagerInfo { - public string QcCode { get; set; } + public string LineCode { get; set; } + public string CheckType { get; set; } + public string CheckDate { get; set; } } /// diff --git a/RIZO.Service/Mes/ProductionPreparation/QualityControlService.cs b/RIZO.Service/Mes/ProductionPreparation/QualityControlService.cs index 7559faf..a674cba 100644 --- a/RIZO.Service/Mes/ProductionPreparation/QualityControlService.cs +++ b/RIZO.Service/Mes/ProductionPreparation/QualityControlService.cs @@ -145,7 +145,18 @@ namespace RIZO.Service.Mes private static Expressionable QueryExp(QualityControlQueryDto parm) { var predicate = Expressionable.Create(); - + if (!string.IsNullOrWhiteSpace(parm.LineCode)) + { + predicate.And(it => it.LineCode.Contains(parm.LineCode)); + } + if (!string.IsNullOrWhiteSpace(parm.CheckDate)) + { + predicate.And(it => it.CheckDate.Contains(parm.CheckDate)); + } + if (!string.IsNullOrWhiteSpace(parm.CheckType)) + { + predicate.And(it => it.CheckType.Contains(parm.CheckType)); + } return predicate; }