This commit is contained in:
余宇波 2025-11-25 16:31:04 +08:00
parent 53cb5e3dfd
commit fb6cb2b24e
2 changed files with 32 additions and 1 deletions

View File

@ -29,6 +29,20 @@ namespace MyCode.Project.Domain.Message.Request.PurchaseOrder
/// </summary>
public DateTime? FDateEmd { get; set; }
/// <summary>
/// Desc:供应商承诺交期--开始
/// Default:
/// Nullable:True
/// </summary>
public DateTime? ChengNuoJiaoQiBegin { get; set; }
/// <summary>
/// Desc:供应商承诺交期--结束
/// Default:
/// Nullable:True
/// </summary>
public DateTime? ChengNuoJiaoQiEnd { get; set; }
///// <summary>
///// Desc:汇率类型
///// Default:

View File

@ -42,9 +42,26 @@ namespace MyCode.Project.Repositories
}
if (condition.FDateBegin.HasValue)
{
DateTime begin = condition.FDateBegin.Value.AddDays(1).Date;
DateTime begin = condition.FDateBegin.Value.Date;
where.AddCondition("a.[FDate]", begin, SqlOperator.MoreThanOrEqual, true);
}
if (condition.ChengNuoJiaoQiBegin.HasValue)
{
DateTime begin = condition.ChengNuoJiaoQiBegin.Value.Date;
where.AddCondition("b.[ChengNuoJiaoQi]", begin, SqlOperator.MoreThanOrEqual, true);
}
if (condition.ChengNuoJiaoQiEnd.HasValue)
{
DateTime end = condition.ChengNuoJiaoQiEnd.Value.AddDays(1).Date;
where.AddCondition("b.ChengNuoJiaoQi", end, SqlOperator.LessThan, true);
}
where.AddCondition("a.supplierId", supplierId, SqlOperator.Equal, !string.IsNullOrWhiteSpace( supplierId));
where.AddCondition("a.FPurchaseOrgId", FPurchaseOrgId, SqlOperator.Equal, !string.IsNullOrWhiteSpace(FPurchaseOrgId) && FPurchaseOrgId != "-1");
where.AddCondition("b.MaterialCode", condition.MaterialCode, SqlOperator.Like, !string.IsNullOrWhiteSpace(condition.MaterialCode));