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

SVN r259

Browse Source 
SVN-Revision: r259
This commit is contained in:
cyf
2025-02-08 06:53:32 +00:00
parent e776f3bd62
commit 2d55f472c0
7 changed files with 20 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Business/Impl/BillImpl.cs
+2 -25
View File
@@ -423,7 +423,7 @@ namespace Lskj.Business.Impl
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,
isnull(CASE WHEN ISNULL(c.userList,'')='' AND ISNULL(a.PrivilegeOper,'')<>'' THEN 1 ELSE edited END,0) edit,isnull(isVisible,0) isVisible,
isnull(CASE WHEN ISNULL(c.userList,'')='' AND ISNULL(a.PrivilegeOper,'')<>'' THEN 1 ELSE edited END,0) edit,isnull(isVisible,0) isVisible,CASE WHEN isnull(isVisible,0) = 0 THEN 0 ELSE 1 END vislble,
a.id,a.fieldName,isnull(a.[sysName],'') sysName,a.username,a.dataFormat,a.fieldTypeId fieldsqltag,a.calcOrder,a.isSum,a.defaultValue defaultdate,{2}
a.lookupKeyField fieldsqlid,a.lookupResult fieldsqlname,a.lookupSql fieldsql,a.calcExpr,a.orderid,isnull(a.nullable,0) nullable,a.unionFields,a.unionValue {3}{4}
FROM p_systembillDetail a
@@ -863,27 +863,4 @@ namespace Lskj.Business.Impl
SqlParameter[] param =
{
new SqlParameter("@FormText",SqlDbType.VarChar,50),
new SqlParameter("@userId",SqlDbType.Int,20),
new SqlParameter("@UserName",SqlDbType.VarChar,50),
new SqlParameter("@Privilege",SqlDbType.Int,4),
new SqlParameter("@ModuleCode",SqlDbType.VarChar,50),
new SqlParameter("@ModuleId",SqlDbType.VarChar,50),
};
param[0].Value = SysModel.FormText;
param[1].Value = ERPInfo.Instance.UserId;
param[2].Value = ERPInfo.Instance.UserName;
param[3].Value = SysModel.Privilege;
param[4].Value = SysModel.ModuleCode;
param[5].Value = SysModel.ModuleId;
ds = SqlHelper.ExecuteDataSet(CommandType.StoredProcedure, "p_Get_NewDesignPlatform_PubAccraditation2", "cacheSYSConfig", param);
return ds;
}
}
}
new Sq
插件库/Lskj.Business/Impl/SystemInfo.cs
+2 -29
View File
@@ -284,6 +284,7 @@ namespace Lskj.Business
//Instance.OptimizationSpeed = false;
Instance.DetailExportDisplay = item.Table.Columns.Contains("DetailExportDisplay") && !string.IsNullOrEmpty(item["DetailExportDisplay"] + "") ? "1".Equals(item["DetailExportDisplay"] + "") : false;
Instance.ConventionalPrintingDisplay = item.Table.Columns.Contains("ConventionalPrintingDisplay") && !string.IsNullOrEmpty(item["ConventionalPrintingDisplay"] + "") ? "1".Equals(item["ConventionalPrintingDisplay"] + "") : false;
Instance.HideSubtitle = item.Table.Columns.Contains("HideSubtitle") && !string.IsNullOrEmpty(item["HideSubtitle"] + "") ? "1".Equals(item["HideSubtitle"] + "") : false;
}
/// <summary>
/// 高拍仪AccessKey
@@ -902,32 +903,4 @@ namespace Lskj.Business
/// <summary>
///mac地址强制判断(必须指定电脑，未指定的不允许登录)
/// </summary>
public bool MacMandatoryJudgment;
/// <summary>
///高效验证（表格重新加载数据前，验证是否有新增或者修改状态的列）
/// </summary>
public bool EfficientVerification;
/// <summary>
///粘贴时不清除表格排序
/// </summary>
public bool CancelPasteClearSort;
/// <summary>
///树结构特殊加载（数据源中有Pid列，则pid设置为对应节点的父节点）
/// </summary>
public bool TreeSpecialBinding;
/// <summary>
///优化速度加载
/// </summary>
public bool OptimizationSpeed;
/// <summary>
///明细导出显示
/// </summary>
public bool DetailExportDisplay;
/// <summary>
///常规打印显示
/// </summary>
public bool ConventionalPrintingDisplay;
}
}
public bool MacMandatoryJudgme
插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs
+2 -2
View File
@@ -628,11 +628,11 @@ namespace Lskj.Control.MultiModelLookUp
public void InitControls(string UnionModuleCodel)
{
this.SysModel.MenuSql = this.NewSourceSQL;
//this.SysModel.MenuSql = this.NewSourceSQL;
//设置上方条件
this.pl_top.Controls.Clear();
DataTable queryTable = BaseModuleImpl.GetCustomQueryFields(this.SysModel.CondKey);//加载自定义配置字段
this.SearchObj = new MyControl(this.SysModel.MenuSql, this.gcMain, LeftTreeViewEx, LeftGridEx);
this.SearchObj = new MyControl(this.NewSourceSQL, this.gcMain, LeftTreeViewEx, LeftGridEx);
this.SearchObj.ParentUnionField = this.ParentUnionField;
this.pl_top.Height = 0;
this.pl_top.Height = this.SearchObj.InitSearchControl(queryTable, this.pl_top);
插件库/Lskj.Main/Control/MainPanelControlEx.cs
+2 -39
View File
@@ -451,7 +451,7 @@ namespace Lskj.Main.Control
//this.pl_top_left.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pl_top_left.BackgroundImage")));
this.pl_top_left.Visible = true;
this.menuMain.Visible = true;
this.lblSubTitle.Visible = true;
this.lblSubTitle.Visible = SystemInfo.Instance.HideSubtitle?false:true;
this.ResetPanelWidth();
}
/// <summary>
@@ -4216,41 +4216,4 @@ namespace Lskj.Main.Control
{
bottomLayoutPanel.RowStyles[i].Height = 25;
}
}
}
catch (Exception)
{
}
}
}
/// <summary>
/// 判断是不是数值
/// </summary>
/// <param name="oText"></param>
/// <returns></returns>
private bool IsNumberic(string oText)
{
try
{
int var1 = Convert.ToInt32(oText);
return true;
}
catch
{
return false;
}
}
#region 加密狗验证
/// <summary>
/// 加密狗验证
/// </summary>
/// <returns></returns>
private void DogVerify()
{
int[] keyHandles = ERPInfo.Instance.keyHandles = new int[8];
int[] keyNumber = ERPInfo.Instance.keyNumber = new int[8];
int rtn = SmartX1Api.SmartX1Find("Ls_ERP", keyHandles, keyNumber);
}
#endregion
}
}
插件库/Lskj.Model/BillModel.cs
+5 -8
View File
@@ -342,6 +342,10 @@ namespace Lskj.Model
/// 主表显示横向滚动条
/// </summary>
public bool MainHorizontalScrolling;
/// <summary>
/// 禁显列不加载数据源
/// </summary>
public bool DisableFieldSources;
/// <summary>
@@ -411,11 +415,4 @@ namespace Lskj.Model
this.DraggingOrder = columns.Contains("DraggingOrder") && !string.IsNullOrEmpty(rowItem["DraggingOrder"] + "") ? "1".Equals(rowItem["DraggingOrder"] + "") : false;
this.IsBrp = columns.Contains("IsBrp") && !string.IsNullOrEmpty(rowItem["IsBrp"] + "") ? "1".Equals(rowItem["IsBrp"] + "") : false;
this.DetailTreeTable = columns.Contains("DetailTreeTable") && !string.IsNullOrEmpty(rowItem["DetailTreeTable"] + "") ? "1".Equals(rowItem["DetailTreeTable"] + "") : false;
this.DetailTreeTableExpansion = columns.Contains("DetailTreeTableExpansion") && !string.IsNullOrEmpty(rowItem["DetailTreeTableExpansion"] + "") ? rowItem["DetailTreeTableExpansion"] + "" : "1";
this.SelectLast = columns.Contains("SelectLast") && !string.IsNullOrEmpty(rowItem["SelectLast"] + "") ? "1".Equals(rowItem["SelectLast"] + "") : false;
this.LoadFilter = columns.Contains("LoadFilter") && !string.IsNullOrEmpty(rowItem["LoadFilter"] + "") ? "1".Equals(rowItem["LoadFilter"] + "") : false;
this.MainVerticalScroll = columns.Contains("MainVerticalScroll") && !string.IsNullOrEmpty(rowItem["MainVerticalScroll"] + "") ? "1".Equals(rowItem["MainVerticalScroll"] + "") : false;
this.MainHorizontalScrolling = columns.Contains("MainHorizontalScrolling") && !string.IsNullOrEmpty(rowItem["MainHorizontalScrolling"] + "") ? "1".Equals(rowItem["MainHorizontalScrolling"] + "") : false;
}
}
}
this.DetailTreeTableExpansion = columns.Contains("DetailTreeTableExpansion") && !string
插件库/Lskj.Model/ModuleModel.cs
+5 -10
View File
@@ -876,6 +876,10 @@ namespace Lskj.Model
/// 多表头为空的列头加在最后
/// </summary>
public bool BandedAddToEnd;
/// <summary>
/// 禁显列不加载数据源
/// </summary>
public bool DisableFieldSources;
#endregion
/// <summary>
@@ -1019,13 +1023,4 @@ namespace Lskj.Model
this.ImportConditions = rowItem.Table.Columns.Contains("ImportConditions") ? rowItem["ImportConditions"] + "" : "";
this.TreeNodeRefresh = rowItem.Table.Columns.Contains("TreeNodeRefresh") ? "1".Equals(rowItem["TreeNodeRefresh"] + "") : false;
this.DragDirection = rowItem.Table.Columns.Contains("DragDirection") && !string.IsNullOrEmpty(rowItem["DragDirection"] + "") ? Convert.ToInt32(rowItem["DragDirection"] + "") : 0;
this.VerifyRowStatus = rowItem.Table.Columns.Contains("VerifyRowStatus") ? "1".Equals(rowItem["VerifyRowStatus"] + "") : false;
this.DoubleClickMode = rowItem.Table.Columns.Contains("DoubleClickMode") ? "1".Equals(rowItem["DoubleClickMode"] + "") : false;
this.SaveWhenSwitching = rowItem.Table.Columns.Contains("SaveWhenSwitching") ? "1".Equals(rowItem["SaveWhenSwitching"] + "") : false;
this.LoadFilter = rowItem.Table.Columns.Contains("LoadFilter") ? "1".Equals(rowItem["LoadFilter"] + "") : false;
this.DoubleClickDetail = rowItem.Table.Columns.Contains("DoubleClickDetail") ? "1".Equals(rowItem["DoubleClickDetail"] + "") : false;
this.DynamicMain = rowItem.Table.Columns.Contains("DynamicMain") ? "1".Equals(rowItem["DynamicMain"] + "") : false;
this.BandedAddToEnd = rowItem.Table.Columns.Contains("BandedAddToEnd") ? "1".Equals(rowItem["BandedAddToEnd"] + "") : false;
}
}
}
this.VerifyRowStatus = rowItem.Table.Columns.Contains("VerifyRowStatus") ? "1".Equals(rowItem["VerifyRowSta
插件库/Lskj.PubBill/BillModule.cs
+2 -34
View File
@@ -1001,6 +1001,7 @@ namespace Lskj.PubBill
_detailColumns = BillImpl.GetDetailColumns(this.SysModel.ModuleCode, true);//初始化单据明细列
}
}
this.gcMain.DisableFieldSources = this.BillModel.DisableFieldSources;
this.gcMain.Model = this.SysModel;
this.gcMain.ParentControl = this.ControlObj;//把主表控件赋给 单据主表控件、基础档案查询条件控件等等
this.gcMain.SetEditColumns(_detailColumns, GridCustomColumnStruct.BillDetailGridView + this.BillModel.FormKey);//设置可编辑列
@@ -7302,37 +7303,4 @@ namespace Lskj.PubBill
/// </summary>
/// <param name="cond">The cond.</param>
/// <param name="dataRow">The data row.</param>
/// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
private bool ValidateCond(string cond, DataRow dataRow)
{
bool result = false;
string condition = cond;
try
{
if (string.IsNullOrWhiteSpace(cond)) return true;//如果值是空格或者空行，默认正确
cond = ReplaceHelper.ReplaceRowParam(dataRow, cond);
if (cond.StartsWith("@") || cond.StartsWith("!"))
{
result = "1".Equals(BaseImpl.GetDefaultValue(cond));
}
else if (dataRow == null)
{
result = ReplaceHelper.EvalCond(cond);
}
else
{
result = ReplaceHelper.ReplaceRowParamCond(dataRow, cond);
}
return result;
}
catch (Exception ex)
{
}
return result;
}
}
}
/// <returns><c>true</c> if XXXX, <