diff --git a/插件库/Lskj.Control/AuditPanelEx.cs b/插件库/Lskj.Control/AuditPanelEx.cs index f8e8ac4..8601439 100644 --- a/插件库/Lskj.Control/AuditPanelEx.cs +++ b/插件库/Lskj.Control/AuditPanelEx.cs @@ -558,7 +558,7 @@ namespace Lskj.Control } } - + tabMain.BeginUpdate(); foreach (DataRow row in tabPages.Rows) @@ -1364,7 +1364,7 @@ namespace Lskj.Control { ApiHelper apiHelper = new ApiHelper(this.SysModel.ModuleCode, BillDocumentId, tmpParmaryField, this.BaseAccraditModelObj.BillTable, 0); apiHelper.OnEvent(Interface.Api.OperateEvent.BeforeModuleAuditStateChange, Interface.Api.ActionType.Audit);//审核 - if (!string.IsNullOrEmpty(apiHelper.apiResutMsg)) + if (!apiHelper.apiHandler.GetApiSuccess(apiHelper.apiHandlerModels)) { DialogResult dialogResult = MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + apiHelper.apiResutMsg); break; @@ -1379,9 +1379,12 @@ namespace Lskj.Control if (ApiHelper.IsExecEventApi(Interface.Api.OperateEvent.AfterModuleAuditStateChange, this.SysModel.ModuleCode, 0)) { ApiHelper apiHelper = new ApiHelper(this.SysModel.ModuleCode, BillDocumentId, tmpParmaryField, this.BaseAccraditModelObj.BillTable, 0); + this.Info($"进入执行逻辑"); apiHelper.OnEvent(Interface.Api.OperateEvent.AfterModuleAuditStateChange, Interface.Api.ActionType.Audit);//审核 - if (!string.IsNullOrEmpty(apiHelper.apiResutMsg)) + if (!apiHelper.apiHandler.GetApiSuccess(apiHelper.apiHandlerModels)) + { MessageUtil.Show(apiHelper.apiResutMsg); + } } #endregion success++; @@ -1884,4 +1887,23 @@ namespace Lskj.Control string confirmOpers = "", bool ret = false, int returnd = 0, - \ No newline at end of file + int selectConfirmFlag = 0, + bool IsStepOver = false, + int comfirm = 0 + ) + { + string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out msgText, sysModel, stepCode, billDocumentId, message, storedName, accractFlag, remindSelect, remarkText, remindOpers, confirmOpers, ret, returnd, selectConfirmFlag, IsStepOver, comfirm); + + if ("9".Equals(result)) + { + // 继续执行保存 + //if (string.IsNullOrWhiteSpace(msgText)) msgText = "失败"; + if (MessageUtil.Show(msgText, MessageBoxButtons.YesNo) == DialogResult.Yes) + result = AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out msgText, sysModel, stepCode, billDocumentId, message, storedName, accractFlag, remindSelect, remarkText, remindOpers, confirmOpers, ret, returnd, selectConfirmFlag, IsStepOver, 1); + } + + return result; + } + + } +} \ No newline at end of file