diff --git a/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs b/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs index 7455c3a..2c4ce0c 100644 --- a/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs +++ b/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs @@ -8,6 +8,8 @@ namespace DOAN.Model.MES.recipe.Dto /// public class PfRecipeIssueLogQueryDto : PagerInfo { + public string RecipeCode { get; set; } + public string Version { get; set; } } /// diff --git a/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs b/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs index 856d10f..e825e32 100644 --- a/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs +++ b/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs @@ -73,7 +73,17 @@ namespace DOAN.Service.MES.recipe private static Expressionable QueryExp(PfRecipeIssueLogQueryDto parm) { var predicate = Expressionable.Create(); - + if (parm != null) + { + if (!string.IsNullOrEmpty(parm.RecipeCode)) + { + predicate = predicate.And(it => it.RecipeCode == parm.RecipeCode); + } + if (!string.IsNullOrEmpty(parm.Version)) + { + predicate = predicate.And(it => it.Version == parm.Version); + } + } return predicate; } }