From 1bbe7c3549c4100bb983d5434f7101e40797f45b Mon Sep 17 00:00:00 2001
From: Carl <manfulmr@outlook.com>
Date: Fri, 26 Dec 2025 17:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2DTO=E5=8F=8A=E6=9C=8D=E5=8A=A1=E5=B1=82=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=9D=A1=E4=BB=B6=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 MmInventoryQueryDto 中新增了 WarehouseCode 和 MaterialCode 属性（MaterialCode 属性重复添加，建议修正）。在库存服务层的 QueryExp 方法中，增加了对 WarehouseCode 的条件过滤，支持按仓库编码模糊查询。
---
 DOAN.Model/MES/Material/Dto/MmInventoryDto.cs   | 3 +++
 DOAN.Service/MES/Material/MmInventoryService.cs | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
index e6acbfe..6fa4934 100644
--- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
@@ -6,6 +6,9 @@ namespace DOAN.Model.BZFM.Dto
     /// </summary>
     public class MmInventoryQueryDto : PagerInfo 
     {
+        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 8f55bd6..12b6230 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -71,7 +71,8 @@ namespace DOAN.Service.BZFM
         /// <returns></returns>
         private static Expressionable<MmInventory> QueryExp(MmInventoryQueryDto parm)
         {
-            var predicate = Expressionable.Create<MmInventory>();
+            var predicate = Expressionable.Create<MmInventory>()
+                .AndIF(!string.IsNullOrEmpty(parm.WarehouseCode), m => m.WarehouseCode.Contains(parm.WarehouseCode));
 
             return predicate;
         }