diff --git a/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs b/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs index 2c4ce0c..1196a2d 100644 --- a/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs +++ b/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs @@ -10,6 +10,8 @@ namespace DOAN.Model.MES.recipe.Dto { public string RecipeCode { get; set; } public string Version { get; set; } + public DateTime StartTime { get; set; } + public DateTime EndTime { get; set; } } /// diff --git a/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs b/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs index 9c2c57c..16d93a0 100644 --- a/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs +++ b/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs @@ -85,6 +85,14 @@ namespace DOAN.Service.MES.recipe { predicate = predicate.And(it => it.Version == parm.Version); } + if (parm.StartTime != null) + { + predicate = predicate.And(it => it.IssueTime >= parm.StartTime); + } + if (parm.EndTime != null) + { + predicate = predicate.And(it => it.IssueTime <= parm.EndTime); + } } return predicate; }