From 9ec7cf906a983509fccd9ab360e1ac0e46a904eb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 12 四月 2025 15:38:48 +0800
Subject: [PATCH] 生产退料
---
DevApp/Gs.DevApp/UserControl/ShowFilter.cs | 203 +++++++++++++++++++++++++++++---------------------
1 files changed, 119 insertions(+), 84 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
index e2818e7..37a9fb8 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -67,7 +67,7 @@
getPageListQuery();
};
}
-
+
/// <summary>
/// 鏌ヨ闆嗗悎
/// </summary>
@@ -150,7 +150,7 @@
var dt = new DataTable();
dt.Columns.Add("field", typeof(string));
dt.Columns.Add("fieldWhere", typeof(string));
- dt.Columns.Add("fieldValue", typeof(string));
+ dt.Columns.Add("fieldValue", typeof(string));
dt.Columns.Add("fieldType", typeof(string));
foreach (var _sql in FilterList)
{
@@ -198,7 +198,7 @@
{
e.Value = e.Value.ToString();
e.Handled = true;
-
+
}
}
private void repositoryItemComboBox1_SelectedValueChanged(object sender, EventArgs e)
@@ -219,7 +219,7 @@
}
/// <summary>
- /// 绉诲嚭涓�琛�
+ /// 绉诲嚭涓�涓煡璇㈡潯浠�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -239,8 +239,14 @@
}
- #region MyRegion
+ #region 杩欓噷鏄珮绾х鐞嗗憳浣跨敤鐨�
+
+ /// <summary>
+ /// 淇濆瓨缁戝畾鐨勮〃
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void BtnSqlTable_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(_fullName))
@@ -282,7 +288,7 @@
{
string strJson = UtilityHelper.HttpPost("", "Fm/EditQuery", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
if (_rtn.rtnCode > 0)
{
getPageListQuery();
@@ -294,9 +300,59 @@
}
}
+
+ /// <summary>
+ /// 鍒犻櫎缁戝畾琛�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ gvTable.CloseEditor();
+ gvTable.PostEditor();
+ gvTable.UpdateCurrentRow();
+ var rowhandle = gvTable.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvTable.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvTable.DeleteRow(rowhandle);
+ return;
+ }
+ var _obj = new
+ {
+ guid = mxGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "Fm/DeleteQuery", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ getPageListQuery();
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+
+ /// <summary>
+ /// 璇诲彇缁戝畾
+ /// </summary>
+
private void getPageListQuery()
{
- repositoryItemComboBoxSql.Items.Clear();
var _obj = new
{
formPath = this._fullName,
@@ -329,8 +385,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"])
@@ -377,80 +434,12 @@
gvTable.PostEditor();
gvTable.UpdateCurrentRow();
}
- private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
- {
- var rowhandle = gvTable.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvTable.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- if (string.IsNullOrEmpty(mxGuid))
- {
- gvTable.DeleteRow(rowhandle);
- return;
- }
- var _obj = new
- {
- guid = mxGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "Fm/DeleteQuery",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- // getPageListQuery();
- }
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
- private void repositoryItemComboBoxSql_EditValueChanged(object sender, EventArgs e)
- {
- ComboBoxEdit comboBox = sender as ComboBoxEdit;
- if (comboBox != null)
- {
- GridView myView = (gcQuery.MainView as GridView);
- int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
- string _txt = comboBox.Text.Trim();
- var dr = myView.GetDataRow(dataIndex);
- var mxGuid = dr["guid"].ToString();
- if (mxGuid.Length > 0 && _txt.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);
- }
- }
- }
- }
+
+ /// <summary>
+ /// 缂栬緫鍒楁煡璇�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemComboBox3Sql_EditValueChanged(object sender, EventArgs e)
{
@@ -462,7 +451,7 @@
string _txt = comboBox.Text.Trim();
var dr = myView.GetDataRow(dataIndex);
var mxGuid = dr["guid"].ToString();
- if (mxGuid.Length > 0 )
+ if (mxGuid.Length > 0)
{
var _obj = new
{
@@ -488,7 +477,53 @@
}
}
}
-
+ /// <summary>
+ /// 缂栬緫鍒楁煡璇�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ 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