From 8ed8ee61c7ba7367f9d9f649156da5760bda59d4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 28 三月 2025 14:54:07 +0800
Subject: [PATCH] 工艺
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index b4761e5..71353ea 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1589,7 +1589,6 @@
return rowGuid;
}
}
-
return "";
}
@@ -1671,13 +1670,10 @@
btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
}
#region 璁剧疆鎼滅储
- public static string getQueryWord(string str)
+
+ public static FilterEntity getFilterEntityWord(string id, string idDec, string val, string type)
{
- return str.ToUpper().Replace("query_".ToUpper(), "");
- }
- public static FilterEntity getFilterEntityWord(string id, string idDec, string val)
- {
- return new FilterEntity(getQueryWord(id), idDec + ")", " like ", "鍖呭惈)", "%" + val + "%");
+ return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%", type);
}
public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
{
@@ -1696,7 +1692,7 @@
// fiList.Add(new FilterEntity("b.FNumber", "浣跨敤缁勭粐", " like ", "鍖呭惈", "%" + filter.Value + "%"));
string[] ddd = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "").Split(',');
//Contains([fSubsidiary], '005')
- fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim()));
+ fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim(), col.UnboundExpression));
}
return fiList;
}
@@ -1721,8 +1717,20 @@
}
}
else
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
+ {
+ switch (itm.fileType)
+ {
+ case "鏃堕棿绫诲瀷":
+ _sbSqlWhere.Append(" and CONVERT(nvarchar(30)," + itm.fileId+ ",23)" + itm.fileOper + "'" + itm.fileValue + "'");
+ break;
+ //case "鏁板�肩被鍨�":
+ // _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ // break;
+ default:
+ _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ break;
+ }
+ }
}
return _sbSqlWhere.ToString();
}
@@ -1731,7 +1739,7 @@
public delegate void DelegateGetModel(string guid);
public delegate void DelegateGetList(int currentPage);
/// <summary>
- ///
+ /// 璁剧疆涓昏〃鐨勬牱寮�
/// </summary>
/// <param name="gridView1">gridview</param>
/// <param name="picCheckBox">鍥炬爣鎸夐挳</param>
@@ -1762,7 +1770,6 @@
};
gridView1.OptionsView.ShowGroupPanel = false;
gridView1.OptionsCustomization.AllowGroup = false;
-
gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
foreach (GridColumn column in gridView1.Columns)
@@ -1778,7 +1785,6 @@
column.OptionsColumn.ReadOnly = true;
if (column.Tag == null || column.Tag.ToString().Length <= 0)
column.OptionsFilter.AllowAutoFilter = false;
-
}
gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -1884,6 +1890,15 @@
column.Width = 500;
}
}
+
+ /// <summary>
+ /// 璁剧疆閫夐」鍗�
+ /// </summary>
+ /// <param name="gridView1"></param>
+ /// <param name="xtraTabControl1"></param>
+ /// <param name="pageBar1"></param>
+ /// <param name="action"></param>
+ /// <param name="page"></param>
public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null)
{
xtraTabControl1.SelectedPageChanged += (s, e) =>
@@ -2088,10 +2103,11 @@
{
}
- public CboItemEntity(string val, string text)
+ public CboItemEntity(string val, string text,string fType="")
{
Text = text;
Value = val;
+ FType = fType;
}
/// <summary>
@@ -2103,6 +2119,8 @@
/// 瀵硅薄鍊�
/// </summary>
public object Value { get; set; } = "";
+
+ public object FType { get; set; } = "";
public override string ToString()
{
@@ -2124,13 +2142,14 @@
/// <param name="operDec">鎿嶄綔绗﹀娉�</param>
/// <param name="val"></param>
public FilterEntity(string id, string idDec, string oper,
- string operDec, string val)
+ string operDec, string val, string type)
{
fileId = id;
fileIdDec = idDec;
fileOper = oper;
fileOperDec = operDec;
fileValue = val;
+ fileType = type;
}
public string fileId { get; set; }
@@ -2142,5 +2161,7 @@
public string fileOperDec { get; set; }
public string fileValue { get; set; }
+
+ public string fileType { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3