From a5bf7c9eff51ac79e91908aef03ce20f7a2c1d51 Mon Sep 17 00:00:00 2001
From: Carl <manfulmr@outlook.com>
Date: Fri, 26 Dec 2025 16:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A8=A1=E5=9E=8B=E4=B8=8E?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=94=AF=E6=8C=81=E5=88=86=E7=B1=BB=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=8A=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

本次提交在物料实体、DTO及服务层中新增了与物料分类相关的字段（CateoryName、CategoryCode、MaterialCatory），并在查询表达式中增加了对分类编码的模糊查询条件，提升了物料分类的管理和查询能力。
---
 DOAN.Model/MES/Material/Dto/MmMaterialDto.cs   | 5 +++++
 DOAN.Model/MES/Material/MmMaterial.cs          | 4 +++-
 DOAN.Service/MES/Material/MmMaterialService.cs | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs b/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs
index 8904161..c5a5c9a 100644
--- a/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmMaterialDto.cs
@@ -6,11 +6,16 @@ namespace DOAN.Model.BZFM.Dto
     /// </summary>
     public class MmMaterialQueryDto : PagerInfo 
     {
+        public object CateoryName;
+
+        public string CategoryCode { get; set; }
+
         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; }
+        public object MaterialCatory { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Model/MES/Material/MmMaterial.cs b/DOAN.Model/MES/Material/MmMaterial.cs
index 0dacaf4..c51f1ca 100644
--- a/DOAN.Model/MES/Material/MmMaterial.cs
+++ b/DOAN.Model/MES/Material/MmMaterial.cs
@@ -7,6 +7,8 @@ namespace DOAN.Model.BZFM
     [SugarTable("mm_material")]
     public class MmMaterial
     {
+        public object CateoryName;
+
         /// <summary>
         /// 主键ID 
         /// </summary>
@@ -91,6 +93,6 @@ namespace DOAN.Model.BZFM
         /// 描述 
         /// </summary>
         public string Description { get; set; }
-
+        public object MaterialCatory { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/Material/MmMaterialService.cs b/DOAN.Service/MES/Material/MmMaterialService.cs
index d73c2f4..ba1d8fe 100644
--- a/DOAN.Service/MES/Material/MmMaterialService.cs
+++ b/DOAN.Service/MES/Material/MmMaterialService.cs
@@ -72,6 +72,7 @@ namespace DOAN.Service.BZFM
         private static Expressionable<MmMaterial> QueryExp(MmMaterialQueryDto parm)
         {
             var predicate = Expressionable.Create<MmMaterial>()
+                .AndIF(!string.IsNullOrEmpty(parm.CategoryCode), m => m.CategoryCode.Contains(parm.CategoryCode))
                 .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))