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

SVN r1103

Browse Source 
SVN-Revision: r1103
This commit is contained in:
cyf
2026-01-30 07:38:00 +00:00
parent ddaf751b19
commit 5ccfe15fee
12 changed files with 258 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Business/Impl/AttachImpl.cs
+6 -23
View File
@@ -353,9 +353,13 @@ namespace Lskj.Business.Impl
DataTable dt = SqlHelper.ExecuteDataTable(sqlValue, new SqlParameter[] { new SqlParameter("@sName", sName) });
if (dt.Rows.Count > 1)
{
string webpath11 = Lskj.Web.Core.Util.FileUtil.UrlEncode(HttpUtility.UrlDecode(webpath), false);
//if (!webpath.StartsWith("%")) webpath = "%" + webpath;
sqlValue = string.Format("select * from P_fm_FileTab where sName='{0}' and (webpath like '%{1}' or webpath like '%{2}')", sName, webpath, HttpUtility.UrlDecode(webpath).Replace("#", "%23").Replace("%2f", "/"));
sqlValue = string.Format("select * from P_fm_FileTab where sName='{0}' and (webpath like '%{1}' )", sName, webpath11);
//sqlValue = string.Format("select * from P_fm_FileTab where sName='{0}' and (webpath like '%{1}' or webpath like '%{2}' or webpath like '%{3}')", sName, webpath, HttpUtility.UrlDecode(webpath).Replace("#", "%23").Replace("%2f", "/").Replace("（", "%ef%bc%88").Replace("）", "%ef%bc%89"), HttpUtility.UrlDecode(webpath));
dt = SqlHelper.ExecuteDataTable(sqlValue);
}
return dt.Rows.Count > 0 ? dt.Rows[0] : null;
}
@@ -428,25 +432,4 @@ namespace Lskj.Business.Impl
public static DataTable GetCameraFileData()
{
string sqlValue = @" select '1' id , 'stepCode' fieldName, 65 width, '' sysname , '编号' username, '' dataFormat union
select '2' , 'Name' ,148 , '' , '文件名' , '' union
select '3' , 'Created' ,120 , '' , '时间' , '' union
select '4' , 'key' ,67 , '' , '隐藏字段' , '' ";
return SqlHelper.ExecuteDataTable(sqlValue);
}
/// <summary>
/// <para>说明：获取附件条数</para>
/// <para>创建人：龚宇超</para>
/// <para>创建日期：2018-08-10 </para>
/// <para>修改人：</para>
/// <para>修改日期：</para>
/// <para>修改备注：</para>
/// <para>版本：1.0</para>
/// </summary>
/// <returns>System.Int32.</returns>
public static int GetFileCount(string dirid, string pid)
{
DataTable dt = SqlHelper.ExecuteDataTable(string.Format("select 1 from P_fm_FileTab where parentId='{0}'", GetAttachDirectoryId(dirid, pid)));
return dt == null ? 0 : Convert.ToInt32(dt.Rows.Count);
}
}
}
select '2' , 'Name' ,
插件库/Lskj.Business/Impl/BaseAuditImpl.cs
+36 -11
View File
@@ -854,47 +854,49 @@ namespace Lskj.Business.Impl
if (string.IsNullOrEmpty(whereCond))
whereCond = " and orderid > 0 ";
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "rightVisible"))
DataTable dataTable = GetTableColumns("p_systembillauditAttach");
if (dataTable.Columns.Contains("rightVisible"))
{
columnStr = ",rightVisible";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "DetailIsSave"))
if (dataTable.Columns.Contains("DetailIsSave"))
{
DetailIsSave = ",DetailIsSave";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "unionmodule") && BaseImpl.HasExistsColumn("p_systembillauditAttach", "unionValue") && BaseImpl.HasExistsColumn("p_systembillauditAttach", "unionParentField") && BaseImpl.HasExistsColumn("p_systembillauditAttach", "unionCond"))
if (dataTable.Columns.Contains("unionmodule") && dataTable.Columns.Contains("unionValue") && dataTable.Columns.Contains("unionParentField") && dataTable.Columns.Contains("unionCond"))
{
unionCond = ",unionmodule unionModule,unionValue,unionParentField,unionCond";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "privilegeoper"))
if (dataTable.Columns.Contains("privilegeoper"))
{
fields += ",privilegeoper";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "enablecond"))
if (dataTable.Columns.Contains("enablecond"))
{
fields += " ,enablecond";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "DBClickEvent"))
if (dataTable.Columns.Contains("DBClickEvent"))
{
fields += " ,DBClickEvent";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "LoadFilter"))
if (dataTable.Columns.Contains("LoadFilter"))
{
fields += " ,LoadFilter";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "IsUnioDetail"))
if (dataTable.Columns.Contains("IsUnioDetail"))
{
fields += " ,IsUnioDetail";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "gridDetailCheck"))
if (dataTable.Columns.Contains("gridDetailCheck"))
{
fields += " ,gridDetailCheck";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "DetailSearch"))
if (dataTable.Columns.Contains("DetailSearch"))
{
fields += " ,DetailSearch";
}
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "DragExecuteSql"))
if (dataTable.Columns.Contains("DragExecuteSql"))
{
fields += " ,DragExecuteSql";
}
@@ -969,6 +971,29 @@ namespace Lskj.Business.Impl
//string sqlValue = string.Format("select case when stepcode=0 then stepName else REPLACE(REPLACE(REPLACE(operDirection,'R','退'),'F','审'),'Q','关闭') end as sh,* from {0} where flowSourceKey=@flowSourceKey {1} order by id asc", tableName, fields);
string sqlValue = string.Format("select case when stepcode=0 then stepName else REPLACE(REPLACE(REPLACE(REPLACE(operDirection,'R','退'),'F','审'),'Q','关闭'),'J','转交') end as sh,* from {0} where flowSourceKey=@flowSourceKey {1} order by id asc", tableName, fields);
if (Business.Impl.LanguageTranslation.Translatable)
{
string retreat = Business.Impl.LanguageTranslation.GetTranslatedText("退");
string review = Business.Impl.LanguageTranslation.GetTranslatedText("审");
string close = Business.Impl.LanguageTranslation.GetTranslatedText("关闭");
string forward = Business.Impl.LanguageTranslation.GetTranslatedText("转交");
string first = Business.Impl.LanguageTranslation.GetTranslatedText("首次提交");
sqlValue = string.Format(@"SELECT
REPLACE(
CASE
WHEN stepcode=0 THEN stepName
ELSE REPLACE(REPLACE(REPLACE(REPLACE(operDirection,'R','{2}'),'F','{3}'),'Q','{4}'),'J','{5}')
END,
'首次提交',
'{6}'
) AS sh,
*
from {0} where flowSourceKey=@flowSourceKey {1} order by id asc", tableName, fields, retreat, review, close, forward, first);
}
return SqlHelper.ExecuteDataTable(sqlValue, new SqlParameter[] { new SqlParameter("@flowSourceKey", paramaryValue), new SqlParameter("@flowSource", modeCode) });
}
/// <summary>
插件库/Lskj.Business/Impl/BaseImpl.cs
+51 -13
View File
@@ -16,7 +16,7 @@ using Lskj.Model;
using Lskj.Core;
using Lskj.Util;
using System.Data.SqlClient;
using System.Data.Common;
namespace Lskj.Business.Impl
{
@@ -137,7 +137,7 @@ namespace Lskj.Business.Impl
try
{
string sqlValue = string.Format("select OBJECT_ID(N'{0}', N'P') ", Name);
return !string.IsNullOrWhiteSpace(SqlHelper.ExecuteScalar(sqlValue)+"");
return !string.IsNullOrWhiteSpace(SqlHelper.ExecuteScalar(sqlValue) + "");
}
catch (Exception)
{
@@ -507,7 +507,7 @@ namespace Lskj.Business.Impl
/// <param name="sqlValue">The SQL value.</param>
/// <param name="parameters">The parameters.</param>
/// <returns>System.Int32.</returns>
public static int ExecSqlValue(string sqlValue, params SqlParameter[] parameters)
public static int ExecSqlValue(string sqlValue, params SqlParameter[] parameters)
{
try
{
@@ -556,7 +556,7 @@ namespace Lskj.Business.Impl
/// <param name="sqlValue">The SQL value.</param>
/// <param name="parameters">The parameters.</param>
/// <returns>System.Int32.</returns>
public static int ExecSqlValue(string sqlValue, SqlTransaction Trans, params SqlParameter[] parameters)
public static int ExecSqlValue(string sqlValue, DbTransaction Trans, params SqlParameter[] parameters)
{
try
{
@@ -594,9 +594,8 @@ namespace Lskj.Business.Impl
/// <param name="sqlValue">The SQL value.</param>
/// <param name="parameters">The parameters.</param>
/// <returns>System.Object.</returns>
public static int ExecProcedure(string sqlValue, params SqlParameter[] parameters)
public static int ExecProcedure(string sqlValue, params DbParameter [] parameters)
{
return SqlHelper.ExecuteNonQuery(CommandType.StoredProcedure, sqlValue, parameters);
}
@@ -612,7 +611,7 @@ namespace Lskj.Business.Impl
/// <param name="sqlValue">The SQL value.</param>
/// <param name="parameters">The parameters.</param>
/// <returns>System.Object.</returns>
public static int ExecProcedure(string sqlValue, SqlTransaction Trans, params SqlParameter[] parameters)
public static int ExecProcedure(string sqlValue, DbTransaction Trans, params DbParameter[] parameters)
{
return SqlHelper.ExecuteNonQuery(CommandType.StoredProcedure, sqlValue, Trans, 1, parameters);
@@ -757,6 +756,44 @@ namespace Lskj.Business.Impl
}
return defaultValue;
}
/// <summary>
/// 替换特殊字符 {#p_
/// </summary>
/// <param name="defaultValue"></param>
/// <param name="parentValue"></param>
/// <param name="otherParams"></param>
/// <returns></returns>
public static string SpecialReplacement(string defaultValue,string[] otherParams = null)
{
if (string.IsNullOrEmpty(defaultValue)) return defaultValue;
if (defaultValue.ToLower().Contains("{#p_"))
{
try
{
List<string> paramList = ReplaceHelper.GetParamFields(defaultValue);
foreach (var item in paramList)
{
string index = item.Replace("{#p_", "").Replace("}", "");
int i = 0;
if (int.TryParse(index, out i))
{
defaultValue = defaultValue.Replace(item, otherParams != null ? otherParams[i - 1] : "");
}
}
}
catch (Exception)
{
}
}
return defaultValue;
}
/// <summary>
/// <para>说明：获取记录</para>
/// <para>创建人：龚宇超</para>
@@ -809,9 +846,9 @@ namespace Lskj.Business.Impl
/// </summary>
/// <param name="sqlValue">The SQL value.</param>
/// <returns>System.String.</returns>
public static object GetResult(string sqlValue, SqlTransaction Trans)
public static object GetResult(string sqlValue, DbTransaction Trans)
{
return SqlHelper.ExecuteScalar(sqlValue, Trans, 1, 1);
return SqlHelper.ExecuteScalar(sqlValue, Trans);
}
/// <summary>
@@ -983,11 +1020,12 @@ namespace Lskj.Business.Impl
/// </summary>
/// <param name="sqlValue">The SQL value.</param>
/// <returns>SqlDataAdapter.</returns>
public static SqlDataAdapter GetAdapterResult(string sqlValue)
public static DbDataAdapter GetAdapterResult(string sqlValue)
{
DbDataAdapter dbDataAdapter = SqlHelper.dbFactory.CreateDataAdapter();
try
{
if (string.IsNullOrWhiteSpace(sqlValue)) return new SqlDataAdapter();
if (string.IsNullOrWhiteSpace(sqlValue)) return dbDataAdapter;
sqlValue = GetDefaultValue(sqlValue);
sqlValue = ReplaceHelper.ReplaceParam(sqlValue);
return SqlHelper.ExecuteAdapter(CommandType.Text, sqlValue);
@@ -995,7 +1033,7 @@ namespace Lskj.Business.Impl
catch (Exception)
{
}
return new SqlDataAdapter();
return dbDataAdapter;
}
/// <summary>
/// <para>说明：获取打印配置</para>
@@ -1051,7 +1089,7 @@ namespace Lskj.Business.Impl
/// <param name="tagid"></param>
/// <param name="mid"></param>
/// <returns></returns>
public static int deleteFlow(int tagid, string Dllcode, string stepCode, int typeID, out string tipMsg, SqlTransaction Trans)
public static int deleteFlow(int tagid, string Dllcode, string stepCode, int typeID, out string tipMsg, DbTransaction Trans)
{
SqlParameter pMsg = new SqlParameter("@msg", SqlDbType.VarChar, 2000);
pMsg.Direction = ParameterDirection.Output;
插件库/Lskj.Business/Impl/BaseModuleImpl.cs
+18 -14
View File
@@ -904,35 +904,38 @@ namespace Lskj.Business.Impl
public static DataTable GetCustomQueryFields(string formKey)
{
string field = string.Empty;
if (HasExistsColumn("p_systembillsourcecond", "FontSize"))
DataTable dataTable = GetTableColumns("p_systembillsourcecond");
if (dataTable.Columns.Contains("FontSize"))
{
field = ",FontSize";
}
if (HasExistsColumn("p_systembillsourcecond", "FontColor"))
if (dataTable.Columns.Contains("FontColor"))
{
field += ",FontColor";
}
if (HasExistsColumn("p_systembillsourcecond", "refreshSource"))
if (dataTable.Columns.Contains("refreshSource"))
{
field += ",refreshSource";
}
if (HasExistsColumn("p_systembillsourcecond", "clickAfterEmpty"))
if (dataTable.Columns.Contains("clickAfterEmpty"))
{
field += ",clickAfterEmpty";
}
if (HasExistsColumn("p_systembillsourcecond", "RefreshButton"))
if (dataTable.Columns.Contains("RefreshButton"))
{
field += ",RefreshButton";
}
if (HasExistsColumn("p_systembillsourcecond", "AddOrderByCond"))
if (dataTable.Columns.Contains("AddOrderByCond"))
{
field += ",AddOrderByCond";
}
if (HasExistsColumn("p_systembillsourcecond", "montage"))
if (dataTable.Columns.Contains("montage"))
{
field += ",montage";
}
if (HasExistsColumn("p_systembillsourcecond", "nullable"))
if (dataTable.Columns.Contains("nullable"))
{
field += ",nullable";
}
@@ -940,30 +943,31 @@ namespace Lskj.Business.Impl
{
field += ",0 nullable";
}
if (HasExistsColumn("p_systembillsourcecond", "LookUpFieldsWidth"))
if (dataTable.Columns.Contains("LookUpFieldsWidth"))
{
field += ",LookUpFieldsWidth";
}
if (HasExistsColumn("p_systembillsourcecond", "ScanAfterEmpty"))
if (dataTable.Columns.Contains("ScanAfterEmpty"))
{
field += ",ScanAfterEmpty";
}
if (HasExistsColumn("p_systembillsourcecond", "ImportReturnValue"))
if (dataTable.Columns.Contains("ImportReturnValue"))
{
field += ",ImportReturnValue";
}
if (HasExistsColumn("p_systembillsourcecond", "ImportCurrentValue"))
if (dataTable.Columns.Contains("ImportCurrentValue"))
{
field += ",ImportCurrentValue";
}
if (HasExistsColumn("p_systembillsourcecond", "UnionFields"))
if (dataTable.Columns.Contains("UnionFields"))
{
field += ",UnionFields";
}
if (HasExistsColumn("p_systembillsourcecond", "UnionValue"))
if (dataTable.Columns.Contains("UnionValue"))
{
field += ",UnionValue";
}
string sqlValue = string.Format(@"select id,controlLeft,controlTop,controlWidth,controlHeight,controlType as fieldTypeId,controlName as fieldName,controlLabel as userName,'' DataFormat,
defaultValue,sourceSql as lookupSql,keyField as lookupKeyField,resultField as lookupResult,edited,checkCond,InputHintText{0}
from p_systembillsourcecond
插件库/Lskj.Business/Impl/BillAuditImpl.cs
+9 -5
View File
@@ -138,26 +138,30 @@ namespace Lskj.Business.Impl
public static DataRow GetPubAuditProperty(string menuCode)
{
string field = string.Empty;
if (HasExistsColumn("p_systembilltype", "MuitlAuditFlag"))
DataTable dataTable = GetTableColumns("p_systembilltype");
if (dataTable.Columns.Contains("MuitlAuditFlag"))
{
field = ",MuitlAuditFlag";
}
if (HasExistsColumn("p_systembilltype", "BelowDetailLine"))
if (dataTable.Columns.Contains("BelowDetailLine"))
{
field += ",BelowDetailLine";
}
if (HasExistsColumn("p_systembilltype", "BelowDetailSql"))
if (dataTable.Columns.Contains("BelowDetailSql"))
{
field += ",BelowDetailSql";
}
if (HasExistsColumn("p_systembilltype", "MuitlAuditBackFlag"))
if (dataTable.Columns.Contains("MuitlAuditBackFlag"))
{
field += ",MuitlAuditBackFlag";
}
if (HasExistsColumn("p_systembilltype", "DisableAutomaticRefresh"))
if (dataTable.Columns.Contains("DisableAutomaticRefresh"))
{
field += ",DisableAutomaticRefresh";
}
string sqlValue = string.Format("select mastertable,overbacksql,overbackkey,overbackoper,overbackcond,prefix,formkey,billPrintType {0} from p_systembilltype where typecode=@DllCoid", field);
DataTable dtTable = SqlHelper.ExecuteDataTable(sqlValue, new SqlParameter[] { new SqlParameter("@DllCoid", menuCode) });
return dtTable.Rows.Count > 0 ? dtTable.Rows[0] : null;
插件库/Lskj.Business/Impl/BillImpl.cs
+68 -62
View File
@@ -389,58 +389,61 @@ namespace Lskj.Business.Impl
string otherfield = string.Empty;
string detailCond = string.Empty;
string sumCond = string.Empty;
if (HasExistsColumn("p_systembillDetail", "dataAlignment"))//检查数据库表是否包含某列
otherfield = "dataAlignment,fontName,";
if (HasExistsColumn("p_systembillDetail", "ifmerge"))
otherfield += "ifmerge,";
if (HasExistsColumn("p_systembillDetail", "bandTitle"))
otherfield += "bandTitle,";
if (HasExistsColumn("p_systembillDetail", "bandFields"))
otherfield += "bandFields,";
if (HasExistsColumn("p_systembillDetail", "sumText"))
detailCond += ",a.sumText";
if (HasExistsColumn("p_systembillDetail", "AutoPadDataReleColName"))
detailCond += ",a.AutoPadDataReleColName";
if (HasExistsColumn("p_systembillDetail", "sumCond"))
sumCond += ",a.sumCond";
if (HasExistsColumn("p_systembillDetail", "enableCond"))
sumCond += ",a.enableCond";
if (HasExistsColumn("p_systembillDetail", "disableCond"))
sumCond += ",a.disableCond";
if (HasExistsColumn("p_systembillDetail", "labelText"))
sumCond += ",a.labelText";
if (HasExistsColumn("p_systembillDetail", "canCopy"))
DataTable dataTable = GetTableColumns("p_systembillDetail");
//dataTable.Columns.Contains("bandTitle")
if (dataTable.Columns.Contains("dataAlignment"))//检查数据库表是否包含某列
otherfield = "dataAlignment,fontName,";
if (dataTable.Columns.Contains("ifmerge"))
otherfield += "ifmerge,";
if (dataTable.Columns.Contains("bandTitle"))
otherfield += "bandTitle,";
if (dataTable.Columns.Contains("bandFields"))
otherfield += "bandFields,";
if (dataTable.Columns.Contains("sumText"))
detailCond += ",a.sumText";
if (dataTable.Columns.Contains("AutoPadDataReleColName"))
detailCond += ",a.AutoPadDataReleColName";
if (dataTable.Columns.Contains("sumCond"))
sumCond += ",a.sumCond";
if (dataTable.Columns.Contains("enableCond"))
sumCond += ",a.enableCond";
if (dataTable.Columns.Contains("disableCond"))
sumCond += ",a.disableCond";
if (dataTable.Columns.Contains("labelText"))
sumCond += ",a.labelText";
if (dataTable.Columns.Contains("canCopy"))
sumCond += ",a.canCopy";
if (HasExistsColumn("p_systembillDetail", "addModuleId"))
if (dataTable.Columns.Contains("addModuleId"))
sumCond += ",a.addModuleId";
if (HasExistsColumn("p_systembillDetail", "UnionCompare"))
if (dataTable.Columns.Contains("UnionCompare"))
sumCond += ",a.UnionCompare";
if (HasExistsColumn("p_systembillDetail", "isExportColumns"))
if (dataTable.Columns.Contains("isExportColumns"))
sumCond += ",a.isExportColumns";
if (HasExistsColumn("p_systembillDetail", "Summation"))
if (dataTable.Columns.Contains("Summation"))
sumCond += ",a.Summation";
if (HasExistsColumn("p_systembillDetail", "IsRadio"))
if (dataTable.Columns.Contains("IsRadio"))
sumCond += ",a.IsRadio";
if (HasExistsColumn("p_systembillDetail", "SearchBoxAddition"))
if (dataTable.Columns.Contains("SearchBoxAddition"))
sumCond += ",a.SearchBoxAddition ";
if (HasExistsColumn("p_systembillDetail", "RepeatedVerification"))
if (dataTable.Columns.Contains("RepeatedVerification"))
sumCond += ",a.RepeatedVerification ";
if (HasExistsColumn("p_systembillDetail", "LookUpWidth"))
if (dataTable.Columns.Contains("LookUpWidth"))
sumCond += ",a.LookUpWidth ";
if (HasExistsColumn("p_systembillDetail", "LookUpFieldsWidth"))
if (dataTable.Columns.Contains("LookUpFieldsWidth"))
sumCond += ",a.LookUpFieldsWidth ";
if (HasExistsColumn("p_systembillDetail", "PrivilegeView"))
if (dataTable.Columns.Contains("PrivilegeView"))
sumCond += ",a.PrivilegeView ";
if (HasExistsColumn("p_systembillDetail", "PrivilegeOper"))
if (dataTable.Columns.Contains("PrivilegeOper"))
sumCond += ",a.PrivilegeOper ";
if (HasExistsColumn("p_systembillDetail", "ProhibitPaste"))
if (dataTable.Columns.Contains("ProhibitPaste"))
sumCond += ",a.ProhibitPaste ";
if (HasExistsColumn("p_systembillDetail", "FormatEditBox"))
if (dataTable.Columns.Contains("FormatEditBox"))
sumCond += ",a.FormatEditBox ";
if (HasExistsColumn("p_systembillDetail", "PromptText"))
if (dataTable.Columns.Contains("PromptText"))
sumCond += ",a.PromptText ";
if (HasExistsColumn("p_systembillDetail", "SplicingConditions"))
if (dataTable.Columns.Contains("SplicingConditions"))
sumCond += ",a.SplicingConditions ";
string columsSql = string.Format(@"SELECT DISTINCT
@@ -480,58 +483,61 @@ namespace Lskj.Business.Impl
string otherfield = string.Empty;
string detailCond = string.Empty;
string sumCond = string.Empty;
if (HasExistsColumn("p_systembillDetail", "dataAlignment"))//检查数据库表是否包含某列
DataTable dataTable = GetTableColumns("p_systembillDetail");
if (dataTable.Columns.Contains("dataAlignment"))//检查数据库表是否包含某列
otherfield = "dataAlignment,fontName,";
if (HasExistsColumn("p_systembillDetail", "ifmerge"))
if (dataTable.Columns.Contains("ifmerge"))
otherfield += "ifmerge,";
if (HasExistsColumn("p_systembillDetail", "bandTitle"))
if (dataTable.Columns.Contains("bandTitle"))
otherfield += "bandTitle,";
if (HasExistsColumn("p_systembillDetail", "bandFields"))
if (dataTable.Columns.Contains("bandFields"))
otherfield += "bandFields,";
if (HasExistsColumn("p_systembillDetail", "sumText"))
if (dataTable.Columns.Contains("sumText"))
detailCond += ",a.sumText";
if (HasExistsColumn("p_systembillDetail", "AutoPadDataReleColName"))
if (dataTable.Columns.Contains("AutoPadDataReleColName"))
detailCond += ",a.AutoPadDataReleColName";
if (HasExistsColumn("p_systembillDetail", "sumCond"))
if (dataTable.Columns.Contains("sumCond"))
sumCond += ",a.sumCond";
if (HasExistsColumn("p_systembillDetail", "enableCond"))
if (dataTable.Columns.Contains("enableCond"))
sumCond += ",a.enableCond";
if (HasExistsColumn("p_systembillDetail", "labelText"))
if (dataTable.Columns.Contains("labelText"))
sumCond += ",a.labelText";
if (HasExistsColumn("p_systembillDetail", "disableCond"))
if (dataTable.Columns.Contains("disableCond"))
sumCond += ",a.disableCond";
if (HasExistsColumn("p_systembillDetail", "canCopy"))
if (dataTable.Columns.Contains("canCopy"))
sumCond += ",a.canCopy";
if (HasExistsColumn("p_systembillDetail", "addModuleId"))
if (dataTable.Columns.Contains("addModuleId"))
sumCond += ",a.addModuleId";
if (HasExistsColumn("p_systembillDetail", "UnionCompare"))
if (dataTable.Columns.Contains("UnionCompare"))
sumCond += ",a.UnionCompare";
if (HasExistsColumn("p_systembillDetail", "isExportColumns"))
if (dataTable.Columns.Contains("isExportColumns"))
sumCond += ",a.isExportColumns";
if (HasExistsColumn("p_systembillDetail", "Summation"))
if (dataTable.Columns.Contains("Summation"))
sumCond += ",a.Summation";
if (HasExistsColumn("p_systembillDetail", "IsRadio"))
if (dataTable.Columns.Contains("IsRadio"))
sumCond += ",a.IsRadio";
if (HasExistsColumn("p_systembillDetail", "SearchBoxAddition"))
if (dataTable.Columns.Contains("SearchBoxAddition"))
sumCond += ",a.SearchBoxAddition ";
if (HasExistsColumn("p_systembillDetail", "RepeatedVerification"))
if (dataTable.Columns.Contains("RepeatedVerification"))
sumCond += ",a.RepeatedVerification ";
if (HasExistsColumn("p_systembillDetail", "LookUpWidth"))
if (dataTable.Columns.Contains("LookUpWidth"))
sumCond += ",a.LookUpWidth ";
if (HasExistsColumn("p_systembillDetail", "LookUpFieldsWidth"))
if (dataTable.Columns.Contains("LookUpFieldsWidth"))
sumCond += ",a.LookUpFieldsWidth ";
if (HasExistsColumn("p_systembillDetail", "PrivilegeView"))
if (dataTable.Columns.Contains("PrivilegeView"))
sumCond += ",a.PrivilegeView ";
if (HasExistsColumn("p_systembillDetail", "PrivilegeOper"))
if (dataTable.Columns.Contains("PrivilegeOper"))
sumCond += ",a.PrivilegeOper ";
if (HasExistsColumn("p_systembillDetail", "ProhibitPaste"))
if (dataTable.Columns.Contains("ProhibitPaste"))
sumCond += ",a.ProhibitPaste ";
if (HasExistsColumn("p_systembillDetail", "FormatEditBox"))
if (dataTable.Columns.Contains("FormatEditBox"))
sumCond += ",a.FormatEditBox ";
if (HasExistsColumn("p_systembillDetail", "PromptText"))
if (dataTable.Columns.Contains("PromptText"))
sumCond += ",a.PromptText ";
if (HasExistsColumn("p_systembillDetail", "SplicingConditions"))
if (dataTable.Columns.Contains("SplicingConditions"))
sumCond += ",a.SplicingConditions ";
string columsSql = string.Format(@"SELECT DISTINCT
插件库/Lskj.Business/Impl/LanguageTranslation.cs
+6 -1
View File
@@ -87,7 +87,12 @@ namespace Lskj.Business.Impl
ContrastiveLanguage.Add(item["中文"] + "", item[ERPInfo.Instance.LanguageName] + "");
}
}
if (ContrastiveLanguage.Count > 0) Translatable = true;
if (ContrastiveLanguage.Count > 0)
{
ERPInfo.Instance.Translatable = true;
ERPInfo.Instance.ContrastiveLanguage = ContrastiveLanguage;
Translatable = true;
}
//DataTable FixedButtonsTable = BaseImpl.GetDataTableResult(string.Format("select [中文],[{0}] from P_FixedButtonsLanguage", ERPInfo.Instance.LanguageName));
//foreach (DataRow item in FixedButtonsTable.Rows)
插件库/Lskj.Business/Impl/MainImpl.cs
+28 -19
View File
@@ -471,13 +471,15 @@ namespace Lskj.Business.Impl
string fields = string.Empty;
if (!string.IsNullOrWhiteSpace(userId))
sqlWhere = string.Format(" and EmployeeId='{0}'", userId);
if (HasExistsColumn("P_EmployeeTab", "SignBmp"))
DataTable dataTable = GetTableColumns("P_EmployeeTab");
if (dataTable.Columns.Contains("SignBmp"))
fields = ",SignBmp";
if (HasExistsColumn("P_EmployeeTab", "Password"))
if (dataTable.Columns.Contains("Password"))
fields += ",Password";
if (HasExistsColumn("P_EmployeeTab", "AD_Id"))
if (dataTable.Columns.Contains("AD_Id"))
fields += ",AD_Id";
if (HasExistsColumn("P_EmployeeTab", "useLanguage"))
if (dataTable.Columns.Contains("useLanguage"))
fields += ",useLanguage";
//if (HasExistsColumn("P_EmployeeTab", "DefaultLedger"))
// fields += ",DefaultLedger";
@@ -501,16 +503,17 @@ namespace Lskj.Business.Impl
string conditions = string.Empty;
string fields = string.Empty;
DataTable dataTable = GetTableColumns("P_EmployeeTab");
if (HasExistsColumn("P_EmployeeTab", "SignBmp"))
if (dataTable.Columns.Contains("SignBmp"))
fields = ",SignBmp";
if (HasExistsColumn("P_EmployeeTab", "Password"))
if (dataTable.Columns.Contains("Password"))
fields += ",Password";
if (HasExistsColumn("P_EmployeeTab", "AD_Id"))
if (dataTable.Columns.Contains("AD_Id"))
fields += ",AD_Id";
if (HasExistsColumn("P_EmployeeTab", "useLanguage"))
if (dataTable.Columns.Contains("useLanguage"))
fields += ",useLanguage";
if (HasExistsColumn("P_EmployeeTab", "mestig"))
if (dataTable.Columns.Contains("mestig"))
{
conditions = "and mestig=1";
}
@@ -538,14 +541,18 @@ namespace Lskj.Business.Impl
string fields = string.Empty;
if (!string.IsNullOrWhiteSpace(userId))
sqlWhere = string.Format(" and EmployeeId='{0}'", userId);
if (HasExistsColumn("P_EmployeeTab", "SignBmp"))
DataTable dataTable = GetTableColumns("P_EmployeeTab");
if (dataTable.Columns.Contains("SignBmp"))
fields = ",SignBmp";
if (HasExistsColumn("P_EmployeeTab", "Password"))
if (dataTable.Columns.Contains("Password"))
fields += ",Password";
if (HasExistsColumn("P_EmployeeTab", "AD_Id"))
if (dataTable.Columns.Contains("AD_Id"))
fields += ",AD_Id";
if (HasExistsColumn("P_EmployeeTab", "useLanguage"))
if (dataTable.Columns.Contains("useLanguage"))
fields += ",useLanguage";
//if (HasExistsColumn("P_EmployeeTab", "DefaultLedger"))
// fields += ",DefaultLedger";
@@ -643,38 +650,40 @@ namespace Lskj.Business.Impl
// 获取权限
condWhere = GetPurviewCond();
}
if (HasExistsColumn("P_FormMenuConfigTab", "useFlag"))
DataTable dataTable = GetTableColumns("P_FormMenuConfigTab");
if (dataTable.Columns.Contains("useFlag"))
{
// 获取可用菜单标识
condWhere += " and isnull(useFlag,0)=1";
}
if (HasExistsColumn("P_FormMenuConfigTab", "TargetMode"))
if (dataTable.Columns.Contains("TargetMode"))
{
// 获取CS端显示标识(0 全部、1cs、 2 手机、3、bs)
condWhere += " and isnull(TargetMode,0) in (0,1)";
}
string fields = string.Empty, field = string.Empty;
if (HasExistsColumn("p_formmenuconfigtab", "menuRow"))
if (dataTable.Columns.Contains("menuRow"))
{
fields += ",menuRow";
field += "a.menuRow,";
}
if (HasExistsColumn("p_formmenuconfigtab", "menuposition"))
if (dataTable.Columns.Contains("menuposition"))
{
fields += ",isnull(menuposition,0)";
field += "isnull(a.menuposition,0) as menuposition,";
}
if (HasExistsColumn("p_formmenuconfigtab", "GroupCaption"))
if (dataTable.Columns.Contains("GroupCaption"))
{
fields += ",GroupCaption";
field += "a.GroupCaption,";
}
string SeriesConds = string.Empty; string SeriesCond = string.Empty;
if (HasExistsColumn("P_FormMenuConfigTab", "SeriesId") && !string.IsNullOrEmpty(ERPInfo.Instance.SeriesId))
if (dataTable.Columns.Contains("SeriesId") && !string.IsNullOrEmpty(ERPInfo.Instance.SeriesId))
{
SeriesConds = ",SeriesId";
SeriesCond = "a.SeriesId,";
}
string countSqlconditions = string.Empty;
string countSql = string.Empty;
if (SystemInfo.Instance.BillCornerMark && HasExistsColumn("P_systemdlltab", "countSql") && HasExistsColumn("p_systembilltype", "countSql"))
插件库/Lskj.Business/Impl/SystemInfo.cs
+9 -3
View File
@@ -301,7 +301,7 @@ namespace Lskj.Business
Instance.HideFixedConditions = item.Table.Columns.Contains("HideFixedConditions") && !string.IsNullOrEmpty(item["HideFixedConditions"] + "") ? "1".Equals(item["HideFixedConditions"] + "") : false;
Instance.ShowGrallyInTop = item.Table.Columns.Contains("ShowGrallyInTop") && !string.IsNullOrEmpty(item["ShowGrallyInTop"] + "") ? "1".Equals(item["ShowGrallyInTop"] + "") : false;
Instance.FallbackDefaultSelection = item.Table.Columns.Contains("FallbackDefaultSelection") && !string.IsNullOrEmpty(item["FallbackDefaultSelection"] + "") ? "1".Equals(item["FallbackDefaultSelection"] + "") : false;
Instance.FoundationHideTableRefresh = item.Table.Columns.Contains("FoundationHideTableRefresh") && !string.IsNullOrEmpty(item["FoundationHideTableRefresh"] + "") ? "1".Equals(item["FallbackDefaultSelection"] + "") : false;
Instance.FoundationHideTableRefresh = item.Table.Columns.Contains("FoundationHideTableRefresh") && !string.IsNullOrEmpty(item["FoundationHideTableRefresh"] + "") ? "1".Equals(item["FoundationHideTableRefresh"] + "") : false;
Instance.AntiAuditUrl = item.Table.Columns.Contains("AntiAuditUrl") && !string.IsNullOrEmpty(item["AntiAuditUrl"] + "") ? item["AntiAuditUrl"] + "" : "";
Instance.HidePDFGeneration = item.Table.Columns.Contains("HidePDFGeneration") && !string.IsNullOrEmpty(item["HidePDFGeneration"] + "") ? "1".Equals(item["HidePDFGeneration"] + "") : false;
Instance.HideFlowchartTab = item.Table.Columns.Contains("HideFlowchartTab") && !string.IsNullOrEmpty(item["HideFlowchartTab"] + "") ? "1".Equals(item["HideFlowchartTab"] + "") : false;
@@ -314,6 +314,8 @@ namespace Lskj.Business
Instance.GridFontName = item.Table.Columns.Contains("GridFontName") ? item["GridFontName"] + "" : "";
Instance.AllowForgetPwd = item.Table.Columns.Contains("AllowForgetPwd") && !string.IsNullOrEmpty(item["AllowForgetPwd"] + "") ? "1".Equals(item["AllowForgetPwd"] + "") : false;
Instance.ResSwitchingPrompt = item.Table.Columns.Contains("ResSwitchingPrompt") && !string.IsNullOrEmpty(item["ResSwitchingPrompt"] + "") ? item["ResSwitchingPrompt"] + "" : "";
Instance.SubscriptRefreshTime = item.Table.Columns.Contains("SubscriptRefreshTime") && !string.IsNullOrEmpty(item["SubscriptRefreshTime"] + "") ? Convert.ToInt32(item["SubscriptRefreshTime"] + "") : 0;
Instance.SubscriptRefreshTime = 1;
}
/// <summary>
/// 高拍仪AccessKey
@@ -794,7 +796,7 @@ namespace Lskj.Business
/// </summary>
public bool HiddenUrl;
/// <summary>
/// 休眠时间
/// 休眠时间（锁屏，单位秒）
/// </summary>
public int AwaitTime;
/// <summary>
@@ -1042,4 +1044,8 @@ namespace Lskj.Business
/// </summary>
public bool HidePDFGeneration;
/// <summary>
/// 隐藏智能�
/// 隐藏智能工具的 流程图 页签
/// </summary>
public bool HideFlowchartTab;
/// <summary>
///特殊�
插件库/Lskj.Business/Impl/WorkFlowBaseImpl.cs
+2 -1
View File
@@ -3,6 +3,7 @@ using Lskj.Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Data.SqlClient;
using System.Linq;
using System.Reflection;
@@ -182,7 +183,7 @@ namespace Lskj.Business.Impl
/// <para>版本：1.0</para>
/// </summary>
/// <returns>System.Int32.</returns>
public static bool SaveBaseFlow(BaseflowModel model, SqlTransaction Trans)
public static bool SaveBaseFlow(BaseflowModel model, DbTransaction Trans)
{
string sqlValue = string.Format(@"INSERT INTO P_systemdlltabflow(typeCode,stepCode,stepName,stepAction,backAction,stepGroup,stepSql,billModifyFields,detailModifyFields,beforeEvent,
afterEvent,stepApplyText,stepBackText,stepApplyContent,stepBackContent,pStepCode,stepCloseText,stepCloseContent,stepCloseTip)
插件库/Lskj.Business/Impl/WorkFlowBillImpl.cs
+2 -1
View File
@@ -16,6 +16,7 @@ using System.Data;
using Lskj.Model;
using System.Data.SqlClient;
using System.Reflection;
using System.Data.Common;
namespace Lskj.Business
{
@@ -227,7 +228,7 @@ namespace Lskj.Business
/// <para>版本：1.0</para>
/// </summary>
/// <returns>System.Int32.</returns>
public static bool SaveBillFlow(BillflowModel model, SqlTransaction Trans)
public static bool SaveBillFlow(BillflowModel model, DbTransaction Trans)
{
string sqlValue = string.Format(@"INSERT INTO p_systembillflow(typeCode,stepCode,stepName,stepAction,backAction,stepGroup,stepSql,billModifyFields,detailModifyFields,beforeEvent,
afterEvent,stepApplyText,stepBackText,stepApplyContent,stepBackContent,tm_Test,pStepCode,stepCloseText,stepCloseContent,stepCloseTip,stepDivide)
插件库/Lskj.Business/Impl/XtraLocalize.cs
+23 -1
View File
@@ -1,5 +1,6 @@
using DevExpress.Utils.Localization;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Localization;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -27,4 +28,25 @@ namespace Lskj.Business.Impl
return Business.Impl.LanguageTranslation.GetTranslatedText("确定");
case StringId.XtraMessageBoxYesButtonText:
return Business.Impl.LanguageTranslation.GetTranslatedText("是");
case StringId.XtraMessageBoxNoButtonText:
return Business.Impl.LanguageTranslation.GetTranslatedText("否");
case StringId.XtraMessageBoxIgnoreButtonText:
return Business.Impl.LanguageTranslation.GetTranslatedText("忽略");
case StringId.XtraMessageBoxAbortButtonText:
return Business.Impl.LanguageTranslation.GetTranslatedText("中止");
case StringId.XtraMessageBoxRetryButtonText:
return Business.Impl.LanguageTranslation.GetTranslatedText("重试");
default:
return ResLocalizer.GetLocalizedString(id);
}
}
else
{
return ResLocalizer.GetLocalizedString(id);
}
}
public override XtraLocalizer<StringId> CreateResXLocalizer()
{
return base.CreateResXLocalizer();
}