SVN-Revision: r999
This commit is contained in:
cyf
2025-09-28 06:46:58 +00:00
parent 3c3354811b
commit d6739afcd1
4 changed files with 417 additions and 22 deletions
+14
View File
@@ -86,6 +86,12 @@ namespace Lskj.Business.Impl
tipMsg = pMsg.Value.ToString();
if (newVer == 1 && billWay == 1) billNo = tipMsg;
if (Convert.ToInt32(returnValue.Value + "") == -1 && ERPInfo.Instance.UserName.Equals("管理员"))
{
SqlStoredProcedurepPrompt.GenerateBillSaveScript( masterSql, detailSql, detailTable, billNo, detailGuid, billSeq, billWay, comfirm,auditFlag ,newVer);
}
return Convert.ToInt32(returnValue.Value + "");
}
}
@@ -158,6 +164,10 @@ namespace Lskj.Business.Impl
DataSet dataSet = SqlHelper.ExecuteDataSet(CommandType.StoredProcedure, "p_billApply", "billApply", param);
tipMsg = pMsg.Value.ToString();
if (Convert.ToInt32(returnValue.Value + "") == -1 && ERPInfo.Instance.UserName.Equals("管理员"))
{
SqlStoredProcedurepPrompt.GenerateBillApplyExecutionScript( typeCode, billNo, hintMsg, comfirm, comfirmFlag);
}
return Convert.ToInt32(returnValue.Value + "");
}
/// <summary>
@@ -426,6 +436,8 @@ namespace Lskj.Business.Impl
sumCond += ",a.PrivilegeOper ";
if (HasExistsColumn("p_systembillDetail", "ProhibitPaste"))
sumCond += ",a.ProhibitPaste ";
if (HasExistsColumn("p_systembillDetail", "FormatEditBox"))
sumCond += ",a.FormatEditBox ";
string columsSql = string.Format(@"SELECT DISTINCT
isnull(CASE WHEN ISNULL(b.userList,'')='' AND ISNULL(a.PrivilegeView,'')<>'' OR isnull(isVisible,0)=1 THEN 0 ELSE width END,0) width,
@@ -511,6 +523,8 @@ namespace Lskj.Business.Impl
sumCond += ",a.PrivilegeOper ";
if (HasExistsColumn("p_systembillDetail", "ProhibitPaste"))
sumCond += ",a.ProhibitPaste ";
if (HasExistsColumn("p_systembillDetail", "FormatEditBox"))
sumCond += ",a.FormatEditBox ";
string columsSql = string.Format(@"SELECT DISTINCT
isnull(CASE WHEN ISNULL(b.userList,'')='' AND ISNULL(a.PrivilegeView,'')<>'' OR isnull(isVisible,0)=1 THEN 0 ELSE width END,0) width,