diff --git a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs index 12845a1..d6bd257 100644 --- a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs @@ -11,6 +11,10 @@ namespace DOAN.Model.BZFM.Dto public string Operator { get; set; } public DateTime? CreatedTime { get; set; } + + public string MaterialCode { get; set; } + + public string InboundNo { get; set; } } /// diff --git a/DOAN.Service/MES/Material/MmRecordInboundService.cs b/DOAN.Service/MES/Material/MmRecordInboundService.cs index dd6056b..476fce2 100644 --- a/DOAN.Service/MES/Material/MmRecordInboundService.cs +++ b/DOAN.Service/MES/Material/MmRecordInboundService.cs @@ -81,6 +81,8 @@ namespace DOAN.Service.BZFM var predicate = Expressionable.Create() .AndIF(!string.IsNullOrEmpty(parm.SupplierCode), it => it.SupplierCode.Contains(parm.SupplierCode)) .AndIF(!string.IsNullOrEmpty(parm.Operator), it => it.Operator.Contains(parm.Operator)) + .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode)) + .AndIF(!string.IsNullOrEmpty(parm.InboundNo), it => it.InboundNo.Contains(parm.InboundNo)) .AndIF(parm.CreatedTime > DateTime.MinValue, it => it.CreatedTime < parm.CreatedTime) ;