From d819916854d5c23e6ffa7cab3237615d0d50007f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 25 三月 2025 17:03:29 +0800
Subject: [PATCH] 到货单
---
DevApp/Gs.DevApp/UserControl/ShowFilter.cs | 98 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
index fb5fae4..c541b5a 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -42,7 +42,7 @@
btnEsc.Click += BtnEsc_Click;
btnQuery.Click += BtnQuery_Click;
//
- gridView1.IndicatorWidth=gvTable.IndicatorWidth=gvQuery.IndicatorWidth = 50;
+ gridView1.IndicatorWidth = gvTable.IndicatorWidth = gvQuery.IndicatorWidth = 50;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -102,13 +102,15 @@
.GetRowCellValue(i, "fieldWhere").ToString());
var _fieldValue = gridView1.GetRowCellValue(i, "fieldValue")
.ToString();
+ var _fieldType = gridView1.GetRowCellValue(i, "fieldType")
+ .ToString();
if (_fileWhere.Contains("like"))
{
_fileWhere = " like ";
_fieldValue = "%" + _fieldValue + "%";
}
list.Add(new FilterEntity(_fieId, _fileIdDec, _fileWhere,
- _fileWhereDec, _fieldValue));
+ _fileWhereDec, _fieldValue, _fieldType));
}
UpdateParent?.Invoke(this,
new UpdateParentEventArgs { FilterList = list });
@@ -120,13 +122,13 @@
private void getPageList()
{
foreach (GridColumn col in _columns)
- if (col.Tag != null && col.Tag.ToString().StartsWith("query"))
+ if (col.Tag != null && !string.IsNullOrEmpty(col.Tag.ToString()))
{
var item = new CboItemEntity();
- item.Text = col.Tag.ToString().Replace("query_", "") +
- "锛�" + col.Caption + "锛�";
+ item.Text = col.Tag.ToString() + "(" + col.Caption + ")";
//item.Value = col.FieldName;
- item.Value = col.Tag.ToString().Replace("query_", "");
+ item.Value = col.Tag.ToString();
+ item.FType = col.UnboundExpression;
repositoryItemComboBox1.Items.Add(item);
}
@@ -139,7 +141,7 @@
foreach (var kvp in d2)
{
var item = new CboItemEntity();
- item.Text = kvp.Key + "锛�" + kvp.Value + "锛�";
+ item.Text = kvp.Key + "(" + kvp.Value + ")";
item.Value = kvp.Key;
repositoryItemComboBox2.Items.Add(item);
}
@@ -149,12 +151,14 @@
dt.Columns.Add("field", typeof(string));
dt.Columns.Add("fieldWhere", typeof(string));
dt.Columns.Add("fieldValue", typeof(string));
+ dt.Columns.Add("fieldType", typeof(string));
foreach (var _sql in FilterList)
{
var dr = dt.NewRow();
- dr["field"] = _sql.fileId + "锛�" + _sql.fileIdDec;
- dr["fieldWhere"] = _sql.fileOper + "锛�" + _sql.fileOperDec;
+ dr["field"] = _sql.fileId + "(" + _sql.fileIdDec;
+ dr["fieldWhere"] = _sql.fileOper + "(" + _sql.fileOperDec;
dr["fieldValue"] = _sql.fileValue.Replace("%", "");
+ dr["fieldType"] = _sql.fileType;
dt.Rows.Add(dr);
}
gcMain.BindingContext = new BindingContext();
@@ -169,7 +173,7 @@
private (string, string) _getFiled(string _field)
{
- return (_field.Split('锛�')[0], _field.Split('锛�')[1]);
+ return (_field.Split('(')[0], _field.Split('(')[1]);
}
private void BtnEsc_Click(object sender, EventArgs e)
@@ -194,9 +198,25 @@
{
e.Value = e.Value.ToString();
e.Handled = true;
+
}
}
-
+ private void repositoryItemComboBox1_SelectedValueChanged(object sender, EventArgs e)
+ {
+ ComboBoxEdit comboBox = sender as ComboBoxEdit;
+ if (comboBox != null)
+ {
+ CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
+ string dddd = _itm.Value.ToString();
+ string ccc = _itm.Text.ToString();
+ string yyy = _itm.FType.ToString();
+ GridView myView = (gcMain.MainView as GridView);
+ int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+ myView.CloseEditor();
+ myView.UpdateCurrentRow();
+ myView.SetRowCellValue(dataIndex, "fieldType", yyy);
+ }
+ }
/// <summary>
/// 绉诲嚭涓�琛�
@@ -276,7 +296,7 @@
}
private void getPageListQuery()
{
- repositoryItemComboBoxSql.Items.Clear();
+
var _obj = new
{
formPath = this._fullName,
@@ -309,8 +329,9 @@
foreach (var a in _job["rtnData"]["list4"])
{
array01.Add(a);
- repositoryItemComboBoxSql.Items.Add(a["tableOtherName"].ToString());
}
+ DataTable dt01 = JsonConvert.DeserializeObject<DataTable>(array01.ToString());
+ repositoryItemSearchLookUpEdit2Sql.DataSource = dt01;
////////////
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -395,7 +416,7 @@
}
}
}
- private void repositoryItemComboBoxSql_EditValueChanged(object sender, EventArgs e)
+ private void repositoryItemComboBox3Sql_EditValueChanged(object sender, EventArgs e)
{
ComboBoxEdit comboBox = sender as ComboBoxEdit;
if (comboBox != null)
@@ -405,12 +426,13 @@
string _txt = comboBox.Text.Trim();
var dr = myView.GetDataRow(dataIndex);
var mxGuid = dr["guid"].ToString();
- if (mxGuid.Length > 0 && _txt.Length > 0)
+ if (mxGuid.Length > 0)
{
var _obj = new
{
guid = mxGuid,
- sqlField = _txt
+ fType = 1,
+ sqlFieldType = _txt
};
try
{
@@ -430,6 +452,50 @@
}
}
}
+ private void repositoryItemSearchLookUpEdit2Sql_EditValueChanged(object sender, EventArgs e)
+ {
+ string _txt = "";
+ SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
+ DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
+ if (SelectedDataRow != null)
+ _txt = SelectedDataRow["tableOtherName"].ToString();
+ GridView myView = (gcQuery.MainView as GridView);
+ int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+ var dr = myView.GetDataRow(dataIndex);
+ var mxGuid = dr["guid"].ToString();
+ gvQuery.SetFocusedRowCellValue("sqlField", _txt);
+ gvQuery.CloseEditor();
+ gvQuery.PostEditor();
+ gvQuery.UpdateCurrentRow();
+ if (mxGuid.Length > 0)
+ {
+ var _obj = new
+ {
+ guid = mxGuid,
+ sqlField = _txt,
+ fType = 0,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ "Fm/EditCol",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode <= 0)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+ }
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3