From 2ea047bd801dd9c0f5ed693be452ee67aa8b5ff3 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期一, 11 十一月 2024 19:35:17 +0800 Subject: [PATCH] 质量审核上的五个按钮 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 119 +++++++++++++++-------------------------------------------- 1 files changed, 31 insertions(+), 88 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs index 15d3300..030fbae 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs @@ -6,11 +6,11 @@ using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; +using DevExpress.XtraGrid.Views.Base.ViewInfo; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.DevFrm.QC.Models; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; -using Gs.DevApp.UserControl; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -24,13 +24,12 @@ public Frm_MesSysLookups() { InitializeComponent(); - toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; - toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; - toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; + toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; getPageList(1, UtilityHelper.GetPageSize()); pageBar1.PagerEvent += PageBar1_PagerEvent; @@ -73,32 +72,34 @@ { getPageList(curPage, pageSize); } - /// <summary> - /// 鏌ヨ浜嬩欢 + /// 鍙嶅鏍� /// </summary> /// <param name="sender"></param> /// <param name="e"></param> - private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) { - var frm = - new ShowFilter(gridView1.Columns, - _filterList); - frm.UpdateParent += Frm_UpdateParent; - frm.ShowDialog(); + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_lookupTypeCode, gridView1); + toolBarMenu1.guidKey = rowGuid; } /// <summary> - /// 鏌ヨ鍥炶皟 + /// 瀹℃牳浜嬩欢 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> - private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) + private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) { - _filterList = e.FilterList; - getPageList(1, pageBar1.RowsCount); + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_lookupTypeCode, gridView1); + toolBarMenu1.guidKey = rowGuid; } - /// <summary> /// 鍙栨秷浜嬩欢 /// </summary> @@ -107,48 +108,6 @@ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); - } - - /// <summary> - /// 鍒犻櫎浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) - { - string rowGuid = "", rowName = ""; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_lookupTypeCode, gridView1); - if (string.IsNullOrEmpty(rowGuid)) - { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) - return; - var lst = new List<dynamic>(); - lst.Add(rowGuid); - var _obj = lst; - try - { - var strJson = UtilityHelper.HttpPost("", - _webServiceName + "DeleteModel", - JsonConvert.SerializeObject(_obj)); - var _rtn = - UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - UtilityHelper.JumpToTab(xtraTabControl1, 0); - getPageList(1, UtilityHelper.GetPageSize()); - } - - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } } /// <summary> @@ -177,25 +136,7 @@ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } - getModel(rowGuid, true, 1); - } - - /// <summary> - /// 鏂板浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) - { - UtilityHelper.JumpToTab(xtraTabControl1, 1); - lbGuid.Text = ""; - var gridViews = - new List<GridView>(); - gridViews.Add(gvMx1); - UtilityHelper.CleanValueByControl(panel1.Controls, true, - gridViews); - UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } /// <summary> @@ -212,7 +153,8 @@ txt_lookupTypeCode.Focus(); return; } - + gvMx1.CloseEditor(); + gvMx1.UpdateCurrentRow(); var lst = new List<MesSysLookups>(); for (var i = 0; i < gvMx1.DataRowCount; i++) { @@ -220,9 +162,7 @@ if (row != null) lst.Add(new MesSysLookups { - Guid = row["Guid"].ToString().Length > 0 - ? Guid.Parse(row["Guid"].ToString()) - : Guid.Empty, + Guid = UtilityHelper.ToGuid(row["Guid"].ToString()), LookupName = row["LookupName"].ToString(), LookupValue = row["LookupValue"].ToString() }); @@ -230,14 +170,11 @@ var _obj = new MesSysLookupTypes { - Guid = lbGuid.Text.Trim().Length > 0 - ? Guid.Parse(lbGuid.Text.Trim()) - : Guid.Empty, + Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), LookupTypeCode = txt_lookupTypeCode.Text, LookupTypeName = txt_lookupTypeName.Text, list = lst }; - try { var strJson = UtilityHelper.HttpPost("", @@ -250,8 +187,10 @@ { lbGuid.Text = _rtn.rtnData; toolBarMenu1.isSetBtn = true; - UtilityHelper.ChangeEnableByControl(panel1.Controls, - false); + var gridViews = new List<GridView>(); + gridViews.Add(gvMx1); + UtilityHelper.ChangeEnableByControl(panel1.Controls, false, + gridViews); } } catch (Exception ex) @@ -273,7 +212,6 @@ itm.fileValue + "'"); _sbSqlWhere.Append("and LOOKUP_TYPE_CODE = 'QATOOLS'"); - var pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); @@ -371,6 +309,11 @@ var mxGuid = dr["guid"].ToString(); if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) return; + if (string.IsNullOrEmpty(mxGuid)) + { + gvMx1.DeleteRow(rowhandle); + return; + } var strJson = ""; var lst = new List<string>(); lst.Add(mxGuid); -- Gitblit v1.9.3