diff --git a/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs b/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs index 1196a2d..3259502 100644 --- a/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs +++ b/DOAN.Model/MES/recipe/Dto/PfRecipeIssueLogDto.cs @@ -19,7 +19,6 @@ namespace DOAN.Model.MES.recipe.Dto /// public class PfRecipeIssueLogDto { - public string Receiver { get; set; } public string CreatedBy { get; set; } @@ -35,9 +34,6 @@ namespace DOAN.Model.MES.recipe.Dto public string Version { get; set; } - public DateTime? IssueTime { get; set; } - - public string IssuedBy { get; set; } } } \ No newline at end of file diff --git a/DOAN.Model/MES/recipe/PfRecipeIssueLog.cs b/DOAN.Model/MES/recipe/PfRecipeIssueLog.cs index 573491a..5fbfac3 100644 --- a/DOAN.Model/MES/recipe/PfRecipeIssueLog.cs +++ b/DOAN.Model/MES/recipe/PfRecipeIssueLog.cs @@ -7,10 +7,6 @@ namespace DOAN.Model.MES.recipe [SugarTable("pf_recipe_issue_log")] public class PfRecipeIssueLog { - /// - /// 接收方 - /// - public string Receiver { get; set; } /// /// 创建人 @@ -53,17 +49,5 @@ namespace DOAN.Model.MES.recipe /// public string Version { get; set; } - /// - /// 下达时间 - /// - [SugarColumn(ColumnName = "issue_time")] - public DateTime? IssueTime { get; set; } - - /// - /// 下达人 - /// - [SugarColumn(ColumnName = "issued_by")] - public string IssuedBy { get; set; } - } } \ No newline at end of file diff --git a/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs b/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs index 5d8ab82..0b81f31 100644 --- a/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs +++ b/DOAN.Service/MES/recipe/PfRecipeIssueLogService.cs @@ -87,11 +87,11 @@ namespace DOAN.Service.MES.recipe } if (parm.StartTime != null && parm.StartTime > DateTime.MinValue) { - predicate = predicate.And(it => it.IssueTime >= parm.StartTime); + predicate = predicate.And(it => it.CreatedTime >= parm.StartTime); } if (parm.EndTime != null && parm.EndTime > DateTime.MinValue) { - predicate = predicate.And(it => it.IssueTime <= parm.EndTime); + predicate = predicate.And(it => it.CreatedTime <= parm.EndTime); } } return predicate;