diff --git a/YLErpDAL/Modules/ClientModule/ClientBlackService.cs b/YLErpDAL/Modules/ClientModule/ClientBlackService.cs index d4c4d709..c5ef8b49 100644 --- a/YLErpDAL/Modules/ClientModule/ClientBlackService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientBlackService.cs @@ -114,7 +114,7 @@ namespace YLErp.Modules.ClientModule .ToList(); } - public void DeleteClientBlack(IEnumerable ids) + public int DeleteClientBlack(IEnumerable ids) { var idList = ids?.Distinct().ToList() ?? new List(); if (idList.Count == 0) @@ -129,6 +129,7 @@ namespace YLErp.Modules.ClientModule } var hasProcess = ProcessList().Any(); + var submitRemovalApprovalCount = 0; foreach (var row in rows) { if (ClientBlackApprovalPolicy.CanDeleteDraft(row.State)) @@ -151,6 +152,7 @@ namespace YLErp.Modules.ClientModule row.ApprovalOptName = UserName; row.ApprovalOptDate = DateTime.Now; ClientBlackCategoryLog(row.id, client_black.删除审批中); + submitRemovalApprovalCount++; } else { @@ -159,6 +161,7 @@ namespace YLErp.Modules.ClientModule } DbContext.SaveChanges(); + return submitRemovalApprovalCount; } public void WithdrawApprovalClientBlack(List ids, out int withdrawCount, out string msg) diff --git a/YLErpWeb/Controllers/clientblackController.cs b/YLErpWeb/Controllers/clientblackController.cs index 9fe1d7ae..923c29ef 100644 --- a/YLErpWeb/Controllers/clientblackController.cs +++ b/YLErpWeb/Controllers/clientblackController.cs @@ -72,8 +72,13 @@ namespace YLErp.Web.Controllers { var datalist = ids.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToList(); var service = new ClientBlackService(CurUser); - service.DeleteClientBlack(datalist); - return JsonSuccess(service.ProcessList().Any() ? "已经提交删除审批!" : "删除成功"); + var submitRemovalApprovalCount = service.DeleteClientBlack(datalist); + var message = submitRemovalApprovalCount == 0 + ? "删除成功" + : submitRemovalApprovalCount == datalist.Count + ? "已经提交删除审批!" + : "删除成功,部分记录已提交删除审批!"; + return JsonSuccess(message); } catch (Exception ex) {