物料分类功能完善

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;
         }