cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r1044

Browse Source 
SVN-Revision: r1044
This commit is contained in:
cyf
2025-11-20 08:54:42 +00:00
parent 055845b380
commit a25c68d10e
10 changed files with 265 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Business/Impl/BillImpl.cs
+10 -2
View File
@@ -87,7 +87,7 @@ 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("管理员"))
if (Convert.ToInt32(returnValue.Value + "") == -1)
{
SqlStoredProcedurepPrompt.GenerateBillSaveScript( masterSql, detailSql, detailTable, billNo, detailGuid, billSeq, billWay, comfirm,auditFlag ,newVer);
}
@@ -164,7 +164,7 @@ 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("管理员"))
if (Convert.ToInt32(returnValue.Value + "") == -1)
{
SqlStoredProcedurepPrompt.GenerateBillApplyExecutionScript( typeCode, billNo, hintMsg, comfirm, comfirmFlag);
}
@@ -438,6 +438,10 @@ namespace Lskj.Business.Impl
sumCond += ",a.ProhibitPaste ";
if (HasExistsColumn("p_systembillDetail", "FormatEditBox"))
sumCond += ",a.FormatEditBox ";
if (HasExistsColumn("p_systembillDetail", "PromptText"))
sumCond += ",a.PromptText ";
if (HasExistsColumn("p_systembillDetail", "SplicingConditions"))
sumCond += ",a.SplicingConditions ";
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,
@@ -525,6 +529,10 @@ namespace Lskj.Business.Impl
sumCond += ",a.ProhibitPaste ";
if (HasExistsColumn("p_systembillDetail", "FormatEditBox"))
sumCond += ",a.FormatEditBox ";
if (HasExistsColumn("p_systembillDetail", "PromptText"))
sumCond += ",a.PromptText ";
if (HasExistsColumn("p_systembillDetail", "SplicingConditions"))
sumCond += ",a.SplicingConditions ";
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,