SVN r1000
SVN-Revision: r1000
This commit is contained in:
@@ -949,7 +949,9 @@ namespace Lskj.Control
|
||||
return;
|
||||
}
|
||||
}
|
||||
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")
|
||||
{
|
||||
@@ -988,7 +990,7 @@ namespace Lskj.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result));
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
}
|
||||
}
|
||||
//if (MessageUtil.Show(string.Format(ResourceKeys.ForcedReturnBill, billDocumentId), MessageBoxButtons.YesNo) == DialogResult.Yes)
|
||||
@@ -1075,7 +1077,9 @@ namespace Lskj.Control
|
||||
}
|
||||
}
|
||||
}
|
||||
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);
|
||||
|
||||
tag = isBack ? "1" : "0";
|
||||
if (result == "1")
|
||||
{
|
||||
@@ -1105,7 +1109,7 @@ namespace Lskj.Control
|
||||
{
|
||||
//MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result));
|
||||
fault++;
|
||||
tipMsg += result + "\r\n";
|
||||
tipMsg += msgText + "\r\n";
|
||||
}
|
||||
|
||||
firstLoad = false;
|
||||
@@ -1322,7 +1326,9 @@ namespace Lskj.Control
|
||||
break;
|
||||
}
|
||||
}
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, stepCode, BillDocumentId, "", this.AuditComModelObj.ProcedureName, "F", "", "批量审批同意");
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, stepCode, BillDocumentId, "", this.AuditComModelObj.ProcedureName, "F", "", "批量审批同意");
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, stepCode, BillDocumentId, "", this.AuditComModelObj.ProcedureName, "F", "", "批量审批同意");
|
||||
|
||||
if ("1".Equals(result))
|
||||
{
|
||||
#region 审核成功后调用API
|
||||
@@ -1339,7 +1345,7 @@ namespace Lskj.Control
|
||||
else
|
||||
{
|
||||
fault++;
|
||||
tipMsg += result + "\r\n";
|
||||
tipMsg += msgText + "\r\n";
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1471,8 +1477,10 @@ namespace Lskj.Control
|
||||
break;
|
||||
}
|
||||
}
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
||||
this.SysModel, stepCode, billDocumentId, "", this.AuditComModelObj.ProcedureName, "R", "", _auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
||||
//this.SysModel, stepCode, billDocumentId, "", this.AuditComModelObj.ProcedureName, "R", "", _auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
this.SysModel, stepCode, billDocumentId, "", this.AuditComModelObj.ProcedureName, "R", "", _auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
string tag = isBack ? "1" : "0";
|
||||
if (result == "1")
|
||||
{
|
||||
@@ -1500,7 +1508,7 @@ namespace Lskj.Control
|
||||
else
|
||||
{
|
||||
fault++;
|
||||
tipMsg += result + "\r\n";
|
||||
tipMsg += msgText + "\r\n";
|
||||
}
|
||||
firstLoad = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user