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

SVN r1137

Browse Source 
SVN-Revision: r1137
This commit is contained in:
cyf
2026-03-19 09:39:11 +00:00
parent f578777256
commit 2352b79793
6 changed files with 149 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Business/Impl/BillImpl.cs
+22 -2
View File
@@ -87,10 +87,14 @@ namespace Lskj.Business.Impl
tipMsg = pMsg.Value.ToString();
if (newVer == 1 && billWay == 1) billNo = tipMsg;
if (Convert.ToInt32(returnValue.Value + "") == -1)
if (Convert.ToInt32(returnValue.Value + "") == -1&& SqlHelper.ConnectionType == ConnectionType.SqlServer)
{
SqlStoredProcedurepPrompt.GenerateBillSaveScript( masterSql, detailSql, detailTable, billNo, detailGuid, billSeq, billWay, comfirm,auditFlag ,newVer);
}
if (Convert.ToInt32(returnValue.Value + "") == -1 && SqlHelper.ConnectionType == ConnectionType.DmServer)
{
SqlStoredProcedurepPrompt.GenerateBillSaveScript_DM(detailSql, SqlHelper.LastFailureSql, detailTable, detailGuid);
}
return Convert.ToInt32(returnValue.Value + "");
}
@@ -166,7 +170,15 @@ namespace Lskj.Business.Impl
tipMsg = pMsg.Value.ToString();
if (Convert.ToInt32(returnValue.Value + "") == -1)
{
SqlStoredProcedurepPrompt.GenerateBillApplyExecutionScript( typeCode, billNo, hintMsg, comfirm, comfirmFlag);
if (SqlHelper.ConnectionType == ConnectionType.SqlServer)
{
SqlStoredProcedurepPrompt.GenerateBillApplyExecutionScript(typeCode, billNo, hintMsg, comfirm, comfirmFlag);
}
if (SqlHelper.ConnectionType == ConnectionType.DmServer)
{
SqlStoredProcedurepPrompt.GenerateBillSaveScript_DM(SqlHelper.LastFailureSql);
}
}
return Convert.ToInt32(returnValue.Value + "");
}
@@ -445,6 +457,10 @@ namespace Lskj.Business.Impl
sumCond += ",a.PromptText ";
if (dataTable.Columns.Contains("SplicingConditions"))
sumCond += ",a.SplicingConditions ";
if (dataTable.Columns.Contains("ColumnAnnotation"))
sumCond += ",a.ColumnAnnotation ";
if (dataTable.Columns.Contains("TitleColor"))
sumCond += ",a.TitleColor ";
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,
@@ -539,6 +555,10 @@ namespace Lskj.Business.Impl
sumCond += ",a.PromptText ";
if (dataTable.Columns.Contains("SplicingConditions"))
sumCond += ",a.SplicingConditions ";
if (dataTable.Columns.Contains("ColumnAnnotation"))
sumCond += ",a.ColumnAnnotation ";
if (dataTable.Columns.Contains("TitleColor"))
sumCond += ",a.TitleColor ";
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,