SVN r1000
SVN-Revision: r1000
This commit is contained in:
@@ -1750,7 +1750,8 @@ namespace Lskj.Control
|
||||
if (isComplete)
|
||||
{
|
||||
WaitForm.ShowForm("正在审核[" + item[this.BaseAccraditModelObj.TmpParmaryField] + "]单据!");
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, item[this.BaseAccraditModelObj.TmpStepField] + "", item[this.BaseAccraditModelObj.TmpParmaryField] + "", "", this.AuditComModelObj.ProcedureName, "F", "", "批量审批同意");
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, item[this.BaseAccraditModelObj.TmpStepField] + "", item[this.BaseAccraditModelObj.TmpParmaryField] + "", "", this.AuditComModelObj.ProcedureName, "F", "", "批量审批同意");
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,this.SysModel, item[this.BaseAccraditModelObj.TmpStepField] + "", item[this.BaseAccraditModelObj.TmpParmaryField] + "", "", this.AuditComModelObj.ProcedureName, "F", "", "批量审批同意");
|
||||
|
||||
if ("1".Equals(result))
|
||||
{
|
||||
@@ -1759,7 +1760,7 @@ namespace Lskj.Control
|
||||
else
|
||||
{
|
||||
fault++;
|
||||
tipMsg = result + "\r\n";
|
||||
tipMsg = msgText + "\r\n";
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1896,7 +1897,10 @@ namespace Lskj.Control
|
||||
{
|
||||
|
||||
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, frmExamine.txtRemark.EditText, 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, frmExamine.txtRemark.EditText, 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, frmExamine.txtRemark.EditText, remindOpers, confirmOpers);
|
||||
|
||||
|
||||
if ("1".Equals(result))
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.AuditSuccess);
|
||||
@@ -1907,7 +1911,7 @@ namespace Lskj.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + result);
|
||||
MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + msgText);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2236,7 +2240,9 @@ namespace Lskj.Control
|
||||
string nextSelectStepCode = string.Empty;
|
||||
string nextSelectStepOper = string.Empty;
|
||||
WaitForm.ShowForm("正在返退[" + item[this.BaseAccraditModelObj.TmpParmaryField] + "]单据!");
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", "0", this._auditAdvice, "", "", true, ret);
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", "0", this._auditAdvice, "", "", 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", "0", this._auditAdvice, "", "", true, ret);
|
||||
|
||||
if ("1".Equals(result))
|
||||
{
|
||||
success++;
|
||||
@@ -2244,7 +2250,7 @@ namespace Lskj.Control
|
||||
else
|
||||
{
|
||||
fault++;
|
||||
tipMsg = result + "\r\n";
|
||||
tipMsg = msgText + "\r\n";
|
||||
}
|
||||
firstLoad = false;
|
||||
}
|
||||
@@ -2260,7 +2266,9 @@ namespace Lskj.Control
|
||||
{
|
||||
string nextSelectStepCode = string.Empty;
|
||||
string nextSelectStepOper = string.Empty;
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", "0", this._auditAdvice, "", "", true, ret);
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", "0", this._auditAdvice, "", "", 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", "0", this._auditAdvice, "", "", true, ret);
|
||||
|
||||
if (result == "1")
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.ForcedSuccess);
|
||||
@@ -2270,7 +2278,7 @@ namespace Lskj.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result));
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2713,7 +2721,9 @@ namespace Lskj.Control
|
||||
Convert.ToInt32(stepCode) >= Convert.ToInt32(this.SectionAccradit["stepCode"] + "");
|
||||
|
||||
string prodouceName = isBack ? AuditComModelObj.ProcedureName + "back" : AuditComModelObj.ProcedureName;
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, stepCode, billDocumentId, isBack ? string.Format(ResourceKeys.ForcedReturnBill, billDocumentId) + "" : "", prodouceName, "R", "0", hintMsg, "", "", !isBack, -1, 0, true);
|
||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, stepCode, billDocumentId, isBack ? string.Format(ResourceKeys.ForcedReturnBill, billDocumentId) + "" : "", prodouceName, "R", "0", hintMsg, "", "", !isBack, -1, 0, true);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,out string msgText, this.SysModel, stepCode, billDocumentId, isBack ? string.Format(ResourceKeys.ForcedReturnBill, billDocumentId) + "" : "", prodouceName, "R", "0", hintMsg, "", "", !isBack, -1, 0, true);
|
||||
|
||||
string tag = isBack ? "1" : "0";
|
||||
if (result == "1")
|
||||
{
|
||||
@@ -2743,7 +2753,7 @@ namespace Lskj.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result));
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user