From d52c235ab2e13e0010d3d0260743bd5a8764a744 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Mon, 29 Dec 2025 15:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=86=E7=B1=BB=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/Material/Dto/MmInventoryDto.cs |  2 ++
 .../MES/Material/Dto/MmMaterialCategoryDto.cs |  5 ++--
 DOAN.Model/MES/Material/MmInventory.cs        |  6 +++++
 .../MES/Material/MmInventoryService.cs        |  2 ++
 .../MES/Material/MmMaterialCategoryService.cs | 23 ++++++++++++++++++-
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
index 4c17f8b..27185ff 100644
--- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
@@ -21,6 +21,8 @@ namespace DOAN.Model.BZFM.Dto
         [Required(ErrorMessage = "物料编码不能为空")]
         public string MaterialCode { get; set; }
 
+        public string MaterialName { get; set; }
+
         [Required(ErrorMessage = "仓库编码不能为空")]
         public string WarehouseCode { get; set; }
 
diff --git a/DOAN.Model/MES/Material/Dto/MmMaterialCategoryDto.cs b/DOAN.Model/MES/Material/Dto/MmMaterialCategoryDto.cs
index 3943d70..e407232 100644
--- a/DOAN.Model/MES/Material/Dto/MmMaterialCategoryDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmMaterialCategoryDto.cs
@@ -6,6 +6,9 @@ namespace DOAN.Model.BZFM.Dto
     /// </summary>
     public class MmMaterialCategoryQueryDto : PagerInfo 
     {
+        public string CategoryCode { get; set; }
+        public string CategoryName { get; set; }
+        public string Status { get; set; }
     }
 
     /// <summary>
@@ -28,8 +31,6 @@ namespace DOAN.Model.BZFM.Dto
         public DateTime? CreatedTime { get; set; }
 
         public DateTime? UpdatedTime { get; set; }
-        [ExcelColumn(Name = "状态(0/1)")]
-        public string StatusLabel { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Model/MES/Material/MmInventory.cs b/DOAN.Model/MES/Material/MmInventory.cs
index d89b76e..9cf7699 100644
--- a/DOAN.Model/MES/Material/MmInventory.cs
+++ b/DOAN.Model/MES/Material/MmInventory.cs
@@ -19,6 +19,12 @@ namespace DOAN.Model.BZFM
         [SugarColumn(ColumnName = "material_code")]
         public string MaterialCode { get; set; }
 
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "material_name")]
+        public string MaterialName { get; set; }
+
         /// <summary>
         /// 仓库编码 
         /// </summary>
diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index 23d9dd0..b30d585 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -182,6 +182,7 @@ namespace DOAN.Service.BZFM
                     var newInventory = new MmInventory()
                     {
                         MaterialCode = mmMaterial.MaterialCode,
+                        MaterialName = mmMaterial.MaterialName,
                         LocationCode = mmLocation.LocationCode,
                         LocationName = mmLocation.LocationName,
                         WarehouseCode = mmLocation.WarehouseCode,
@@ -271,6 +272,7 @@ namespace DOAN.Service.BZFM
                     var newInventory = new MmInventory()
                     {
                         MaterialCode = mmMaterial.MaterialCode,
+                        MaterialName = mmMaterial.MaterialName,
                         LocationCode = mmLocation.LocationCode,
                         LocationName = mmLocation.LocationName,
                         WarehouseCode = mmLocation.WarehouseCode,
diff --git a/DOAN.Service/MES/Material/MmMaterialCategoryService.cs b/DOAN.Service/MES/Material/MmMaterialCategoryService.cs
index ce2e66e..cc03818 100644
--- a/DOAN.Service/MES/Material/MmMaterialCategoryService.cs
+++ b/DOAN.Service/MES/Material/MmMaterialCategoryService.cs
@@ -51,6 +51,14 @@ namespace DOAN.Service.BZFM
         /// <returns></returns>
         public MmMaterialCategory AddMmMaterialCategory(MmMaterialCategory model)
         {
+            // 检查是否有重复
+            bool hasAny = Context.Queryable<MmMaterialCategory>()
+                .Where(it => it.CategoryCode == model.CategoryCode)
+                .Any();
+            if (hasAny)
+            {
+                throw new Exception("分类编码不可重复!");
+            }
             return Insertable(model).ExecuteReturnEntity();
         }
 
@@ -61,6 +69,15 @@ namespace DOAN.Service.BZFM
         /// <returns></returns>
         public int UpdateMmMaterialCategory(MmMaterialCategory model)
         {
+            // 检查是否有重复
+            bool hasAny = Context.Queryable<MmMaterialCategory>()
+                .Where(it => it.CategoryCode == model.CategoryCode)
+                .Where(it => it.Id != model.Id)
+                .Any();
+            if (hasAny)
+            {
+                throw new Exception("分类编码不可重复!");
+            }
             return Update(model, true);
         }
 
@@ -71,7 +88,11 @@ namespace DOAN.Service.BZFM
         /// <returns></returns>
         private static Expressionable<MmMaterialCategory> QueryExp(MmMaterialCategoryQueryDto parm)
         {
-            var predicate = Expressionable.Create<MmMaterialCategory>();
+            var predicate = Expressionable.Create<MmMaterialCategory>()
+                .AndIF(!string.IsNullOrEmpty(parm.CategoryCode),it=>it.CategoryCode.Contains(parm.CategoryCode))
+                .AndIF(!string.IsNullOrEmpty(parm.CategoryName), it => it.CategoryName.Contains(parm.CategoryName))
+                //检查数据:(启用/停用)
+                .AndIF(!string.IsNullOrEmpty(parm.Status), it => it.Status == parm.Status);
 
             return predicate;
         }