diff --git a/插件库/Lskj.PubAccraditation/FrmAccraditation.cs b/插件库/Lskj.PubAccraditation/FrmAccraditation.cs index 52b61db..b331c5d 100644 --- a/插件库/Lskj.PubAccraditation/FrmAccraditation.cs +++ b/插件库/Lskj.PubAccraditation/FrmAccraditation.cs @@ -2274,7 +2274,8 @@ namespace Lskj.PubAccraditation string nextSelectStepCode = string.Empty; string nextSelectStepOper = string.Empty; this._auditAdvice = txtRemark.Text; - string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", "p_BillAudit", "Q", "0", this.txtRemark.Text, "", "", true, -1); + //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", "p_BillAudit", "Q", "0", this.txtRemark.Text, "", "", true, -1); + string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", "p_BillAudit", "Q", "0", this.txtRemark.Text, "", "", true, -1); if ("1".Equals(result)) { MessageUtil.Show(ResourceKeys.CloseSuccess); @@ -2282,7 +2283,7 @@ namespace Lskj.PubAccraditation } else { - MessageUtil.Show(ResourceKeys.CloseFail + "\r\n" + result); + MessageUtil.Show(ResourceKeys.CloseFail + "\r\n" + msgText); } } } @@ -2397,7 +2398,9 @@ namespace Lskj.PubAccraditation if (!this.gridBillInfo.GridControl.isRequiredFields(this.AuditModelObj.RequiredDetailFields, this.gridBillInfo.GridView)) return; } if (!SaveBillData(0, false)) return; - string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txtRemark.Text, remindOpers, confirmOpers); + //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txtRemark.Text, remindOpers, confirmOpers); + string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txtRemark.Text, remindOpers, confirmOpers); + if ("1".Equals(result)) { PushHelper push = new PushHelper(this.SysModel.BillDocumentId, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId); @@ -2407,7 +2410,7 @@ namespace Lskj.PubAccraditation } else { - MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + result); + MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + msgText); } } @@ -2848,8 +2851,12 @@ namespace Lskj.PubAccraditation { if (MessageUtil.Show(ResourceKeys.ConfimAuditFailAndReturnBill, MessageBoxButtons.YesNo) == DialogResult.Yes) { - string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, - this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true); + // string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, + //this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true); + string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, + this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true); + + if (result == "1") { MessageUtil.Show(ResourceKeys.ForcedSuccess); @@ -2860,7 +2867,7 @@ namespace Lskj.PubAccraditation } else { - MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result)); + MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText)); } } } @@ -2876,8 +2883,11 @@ namespace Lskj.PubAccraditation remindOpers = formRemind.RemindOpers; if (isAudit) { - string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, - this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret); + // string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, + //this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret); + string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, + this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret); + if (result == "1") { MessageUtil.Show(ResourceKeys.ForcedSuccess); @@ -2888,7 +2898,7 @@ namespace Lskj.PubAccraditation } else { - MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result)); + MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText)); } } } @@ -2962,8 +2972,12 @@ namespace Lskj.PubAccraditation return; } } - string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, + //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, + //this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true); + string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true); + + if (result == "1") { MessageUtil.Show(ResourceKeys.ForcedSuccess); @@ -2985,7 +2999,7 @@ namespace Lskj.PubAccraditation } else { - MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result)); + MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText)); } } } @@ -3002,8 +3016,11 @@ namespace Lskj.PubAccraditation string confirmOpers = string.Empty, remindOpers = string.Empty; if (isAudit) { - string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, - this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret); + // string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, + //this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret); + string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, + this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret); + if (result == "1") { MessageUtil.Show(ResourceKeys.ForcedSuccess); @@ -3014,7 +3031,7 @@ namespace Lskj.PubAccraditation } else { - MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result)); + MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText)); } } }