From 81d6c2fa723701ad42e1a1638b281fe4f706bd6f Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 20 Sep 2024 13:05:54 +0800 Subject: [PATCH] 1 --- DOAN.Model/MES/mm/Dto/MmRequirePlanDto.cs | 2 ++ DOAN.Service/MES/mm/MmRequirePlanService.cs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DOAN.Model/MES/mm/Dto/MmRequirePlanDto.cs b/DOAN.Model/MES/mm/Dto/MmRequirePlanDto.cs index c7120ab..87bfe43 100644 --- a/DOAN.Model/MES/mm/Dto/MmRequirePlanDto.cs +++ b/DOAN.Model/MES/mm/Dto/MmRequirePlanDto.cs @@ -15,7 +15,9 @@ namespace DOAN.Model.MES.mm.Dto } public class MmRequirePlanQueryDto2 : PagerInfo { + public string MaterialCode { get; set; } + public string MaterialName { get; set; } public DateTime RequireDate { get; set; } diff --git a/DOAN.Service/MES/mm/MmRequirePlanService.cs b/DOAN.Service/MES/mm/MmRequirePlanService.cs index ff33c5a..4a4323a 100644 --- a/DOAN.Service/MES/mm/MmRequirePlanService.cs +++ b/DOAN.Service/MES/mm/MmRequirePlanService.cs @@ -410,8 +410,10 @@ namespace DOAN.Service.group { var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode)) + .AndIF(!string.IsNullOrEmpty(parm.MaterialName), it => it.MaterialName.Contains(parm.MaterialName)) .AndIF(parm.RequireDate != null && parm.RequireDate > DateTime.MinValue, it => it.RequireDate == parm.RequireDate.ToLocalTime().Date) - .AndIF(parm.line_code != null && string.IsNullOrEmpty(parm.line_code), it => it.LineCode == parm.line_code) + .AndIF(!string.IsNullOrEmpty(parm.line_code), it => it.LineCode == parm.line_code) ; var response = Context.Queryable()