From 1eee715d60b625c91deff5da1732128388cba63d Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Thu, 25 Dec 2025 17:38:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B8=85=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Model/MES/Material/Dto/MmMaterialDto.cs | 5 +++++ DOAN.Service/MES/Material/MmMaterialService.cs | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs b/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs index 06fd5c1..8904161 100644 --- a/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs @@ -6,6 +6,11 @@ namespace DOAN.Model.BZFM.Dto /// public class MmMaterialQueryDto : PagerInfo { + public string MaterialName { get; set; } + public string MaterialCode { get; set; } + public string Specification { get; set; } + public string TypeLabel { get; set; } + public string Status { get; set; } } /// diff --git a/DOAN.Service/MES/Material/MmMaterialService.cs b/DOAN.Service/MES/Material/MmMaterialService.cs index 04606cf..94f99d5 100644 --- a/DOAN.Service/MES/Material/MmMaterialService.cs +++ b/DOAN.Service/MES/Material/MmMaterialService.cs @@ -71,8 +71,12 @@ namespace DOAN.Service.BZFM /// private static Expressionable QueryExp(MmMaterialQueryDto parm) { - var predicate = Expressionable.Create(); - + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.MaterialName), m => m.MaterialName.Contains(parm.MaterialName)) + .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), m => m.MaterialCode.Contains(parm.MaterialCode)) + .AndIF(!string.IsNullOrEmpty(parm.Specification), m => m.Specification.Contains(parm.Specification)) + .AndIF(!string.IsNullOrEmpty(parm.TypeLabel), m => m.Type == parm.TypeLabel) + .AndIF(!string.IsNullOrEmpty(parm.Status), m => m.Status == parm.Status); return predicate; } }