SVN r1001

SVN-Revision: r1001
This commit is contained in:
cyf
2025-09-28 06:51:14 +00:00
parent 533029e001
commit c27ead7e09
@@ -1844,7 +1844,9 @@ namespace Lskj.BaseAccraditation
string parmaryValue = this.SysModel.PrimaryValue; string parmaryValue = this.SysModel.PrimaryValue;
if (this.ControlObj.SaveBaseModuleData(this.SysModel.ModuleCode, this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, ref parmaryValue, false, "", false, this.ModuleModelObj.NewVer)) if (this.ControlObj.SaveBaseModuleData(this.SysModel.ModuleCode, this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, ref parmaryValue, false, "", false, this.ModuleModelObj.NewVer))
{ {
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txt_remark.Text, remindOpers, confirmOpers); //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txt_remark.Text, remindOpers, confirmOpers);
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txt_remark.Text, remindOpers, confirmOpers);
if ("1".Equals(result)) if ("1".Equals(result))
{ {
//推送消息 //推送消息
@@ -1855,7 +1857,7 @@ namespace Lskj.BaseAccraditation
} }
else else
{ {
MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + result); MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + msgText);
} }
} }
} }
@@ -2079,7 +2081,9 @@ namespace Lskj.BaseAccraditation
//确认审核不通过并反退该单据? //确认审核不通过并反退该单据?
if (MessageUtil.Show(string.Format(ResourceKeys.ConfimAuditFailAndReturnBill), MessageBoxButtons.YesNo) == DialogResult.Yes) if (MessageUtil.Show(string.Format(ResourceKeys.ConfimAuditFailAndReturnBill), MessageBoxButtons.YesNo) == DialogResult.Yes)
{ {
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txt_remark.Text, "", "", false, returnd, 0, true); //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txt_remark.Text, "", "", false, returnd, 0, true);
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txt_remark.Text, "", "", false, returnd, 0, true);
if ("1".Equals(result)) if ("1".Equals(result))
{ {
MessageUtil.Show(ResourceKeys.ForcedSuccess); MessageUtil.Show(ResourceKeys.ForcedSuccess);
@@ -2091,7 +2095,7 @@ namespace Lskj.BaseAccraditation
} }
else else
{ {
MessageUtil.Show(ResourceKeys.ForcedFail + "\r\n" + result); MessageUtil.Show(ResourceKeys.ForcedFail + "\r\n" + msgText);
} }
} }
} }
@@ -2107,7 +2111,10 @@ namespace Lskj.BaseAccraditation
remindOpers = formRemind.RemindOpers; remindOpers = formRemind.RemindOpers;
if (isAudit) if (isAudit)
{ {
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, remindOpers, confirmOpers, true, returnd); //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, remindOpers, confirmOpers, true, returnd);
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, remindOpers, confirmOpers, true, returnd);
if (result == "1") if (result == "1")
{ {
MessageUtil.Show(ResourceKeys.ForcedSuccess); MessageUtil.Show(ResourceKeys.ForcedSuccess);
@@ -2119,7 +2126,7 @@ namespace Lskj.BaseAccraditation
} }
else else
{ {
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result)); MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
} }
} }
} }
@@ -2324,7 +2331,9 @@ namespace Lskj.BaseAccraditation
{ {
string nextSelectStepCode = string.Empty; string nextSelectStepCode = string.Empty;
string nextSelectStepOper = string.Empty; string nextSelectStepOper = string.Empty;
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "Q", ""); //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "Q", "");
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "Q", "");
if ("1".Equals(result)) if ("1".Equals(result))
{ {
MessageUtil.Show(ResourceKeys.CloseSuccess); MessageUtil.Show(ResourceKeys.CloseSuccess);
@@ -2332,7 +2341,7 @@ namespace Lskj.BaseAccraditation
} }
else else
{ {
MessageUtil.Show(ResourceKeys.CloseFail + "\r\n" + result); MessageUtil.Show(ResourceKeys.CloseFail + "\r\n" + msgText);
} }
} }
} }