From 0f712981aba16dee88780433425cf5132c1f1e8f Mon Sep 17 00:00:00 2001
From: Carl <manfulmr@outlook.com>
Date: Sun, 4 Jan 2026 11:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E4=B8=8E=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=B7=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=8F=8A=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 MmRecordInboundDto 中新增 MaterialCode 和 InboundNo 属性；在 MmRecordInboundService 的 QueryExp 方法中，增加对这两个字段的模糊查询支持，完善入库记录的查询功能。
---
 DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs   | 4 ++++
 DOAN.Service/MES/Material/MmRecordInboundService.cs | 2 ++
 2 files changed, 6 insertions(+)

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; }
     }
 
     /// <summary>
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<MmRecordInbound>()
                 .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)
                 ;