From 9ce8cb1ee053fb5ad4b51d724a5736e0e27ff0aa Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 23 五月 2025 09:10:52 +0800 Subject: [PATCH] 仓库 --- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 68 ++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 24 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs index 3c7c808..81841d5 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Threading.Tasks; -using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.Entity; @@ -10,6 +5,11 @@ using Gs.DevApp.UserControl; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Threading.Tasks; +using System.Windows.Forms; namespace Gs.DevApp.DevFrm { @@ -22,29 +22,30 @@ InitializeComponent(); toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); - Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "docStusTxt", "", (value) => + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "docStusTxt", "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); - }); + }, tips); Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => { getModel(value); }, (value) => { getPageList(this.pageBar1.CurrentPage); - }); + }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - txt_supplier.getSuppler(""); } - private void GridView1_ColumnFilterChanged(object sender, EventArgs e) + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); - Task.Delay(100); + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + Task.Delay(100); getPageList(1); } - + /// <summary> /// 鍒嗛〉浜嬩欢 /// </summary> @@ -65,7 +66,7 @@ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - var frm = new ShowFilter(gridView1.Columns, _filterList); + var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } @@ -108,9 +109,9 @@ /// </summary> /// <param name="curPage">绗嚑椤�</param> /// <param name="pageSize">姣忛〉鍑犳潯</param> - private void getPageList(int curPage) + private void getPageList(int curPage) { - var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); @@ -122,16 +123,16 @@ if (dd.rtnCode > 0) { DataTable dt = dd.rtnData.list; - gcMain.BindingContext = new BindingContext(); + gcMain1.BindingContext = new BindingContext(); gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; if (dt.Rows.Count > 0) { - gcMain.DataSource = dt; - gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gcMain1.DataSource = dt; + gcMain1.ForceInitialize(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else - UtilityHelper.SetDefaultTable(gcMain, gridView1); + UtilityHelper.SetDefaultTable(gcMain1, gridView1); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 pageBar1.CurrentPage = curPage;//褰撳墠椤� @@ -147,6 +148,10 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + /// <summary> + /// 璇诲彇瀹炰綋 + /// </summary> + /// <param name="strGuid"></param> private void getModel(string strGuid) { bool isEdit = false; @@ -173,13 +178,12 @@ lbGuid.Text = strGuid; var gvList = new List<GridView>(); gvList.Add(gvMx1); - UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); var _job = JObject.Parse(strJson); var array = new JArray(); foreach (var a in _job["rtnData"]["list"]) array.Add(a); - var dt = - JsonConvert.DeserializeObject<DataTable>( + var dt = JsonConvert.DeserializeObject<DataTable>( array.ToString()); if (dt.Rows.Count > 0) { @@ -192,6 +196,22 @@ { UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } + + var array2 = new JArray(); + foreach (var a in _job["rtnData"]["list2"]) array2.Add(a); + var dt2 = JsonConvert.DeserializeObject<DataTable>( + array2.ToString()); + if (dt2.Rows.Count > 0) + { + gcMx2.BindingContext = new BindingContext(); + gcMx2.DataSource = dt2; + gcMx2.ForceInitialize(); + gvMx2.BestFitColumns(); + } + else + { + UtilityHelper.SetDefaultTable(gcMx2, gvMx2); + } } else { -- Gitblit v1.9.3