配方下达版本记录
This commit is contained in:
parent
83ff3f7747
commit
80b0f0076c
@ -19,7 +19,6 @@ namespace DOAN.Model.MES.recipe.Dto
|
||||
/// </summary>
|
||||
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; }
|
||||
|
||||
}
|
||||
}
|
||||
@ -7,10 +7,6 @@ namespace DOAN.Model.MES.recipe
|
||||
[SugarTable("pf_recipe_issue_log")]
|
||||
public class PfRecipeIssueLog
|
||||
{
|
||||
/// <summary>
|
||||
/// 接收方
|
||||
/// </summary>
|
||||
public string Receiver { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
@ -53,17 +49,5 @@ namespace DOAN.Model.MES.recipe
|
||||
/// </summary>
|
||||
public string Version { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 下达时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "issue_time")]
|
||||
public DateTime? IssueTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 下达人
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "issued_by")]
|
||||
public string IssuedBy { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user