From def492660c14b0da9364b0370498e8cfd1ba3773 Mon Sep 17 00:00:00 2001
From: Carl <manfulmr@outlook.com>
Date: Mon, 29 Dec 2025 10:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8C=89=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=B1=9E=E6=80=A7=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整 MmInventoryQueryDto，去除重复 MaterialCode 属性；
QueryExp 方法新增 MaterialCode 模糊查询条件，支持按物料编码筛选库存。
---
 DOAN.Model/MES/Material/Dto/MmInventoryDto.cs   | 1 -
 DOAN.Service/MES/Material/MmInventoryService.cs | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
index 6fa4934..4c17f8b 100644
--- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
@@ -8,7 +8,6 @@ namespace DOAN.Model.BZFM.Dto
     {
         public string WarehouseCode { get; set; }
         public string MaterialCode { get; set; }
-        public string MaterialCode { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index 12b6230..f22c703 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -72,7 +72,9 @@ namespace DOAN.Service.BZFM
         private static Expressionable<MmInventory> QueryExp(MmInventoryQueryDto parm)
         {
             var predicate = Expressionable.Create<MmInventory>()
-                .AndIF(!string.IsNullOrEmpty(parm.WarehouseCode), m => m.WarehouseCode.Contains(parm.WarehouseCode));
+                .AndIF(!string.IsNullOrEmpty(parm.WarehouseCode), m => m.WarehouseCode.Contains(parm.WarehouseCode))
+                .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), m => m.MaterialCode.Contains(parm.MaterialCode))
+                ;
 
             return predicate;
         }