From b94097020bf79e3d5f046ac4fbd3c05efcda30b3 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 03 十二月 2024 15:16:27 +0800 Subject: [PATCH] 删除了用户空间的id --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 222 +++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 173 insertions(+), 49 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs index 35db28d..42a9f5a 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs @@ -3,10 +3,10 @@ using System.Data; using System.Drawing; using System.Text; +using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraGrid.Views.Grid; -using Gs.DevApp.DevFrm.QC.Models; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -31,8 +31,16 @@ toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; + toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; - getPageList(1, UtilityHelper.GetPageSize()); + gridView1.FocusedRowChanged += (s, e) => + { + UtilityHelper.SetCheckIco(s, picCheckBox, this, "foneChecked", ""); + }; + getPageList(1); + Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); pageBar1.PagerEvent += PageBar1_PagerEvent; gridView1.CustomDrawRowIndicator += (s, e) => { @@ -51,7 +59,12 @@ //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷� _setIno(); } - + private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); + await Task.Delay(100); + getPageList(1); + } /// <summary> /// 鍙屽嚮浜嬩欢 /// </summary> @@ -73,7 +86,7 @@ /// <param name="pageSize"></param> private void PageBar1_PagerEvent(int curPage, int pageSize) { - getPageList(curPage, pageSize); + getPageList(curPage); } /// <summary> @@ -83,9 +96,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) { - var frm = - new ShowFilter(gridView1.Columns, - _filterList); + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + var frm = new ShowFilter(gridView1.Columns, _filterList); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } @@ -98,9 +112,63 @@ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) { _filterList = e.FilterList; - getPageList(1, pageBar1.RowsCount); + getPageList(1); + } + /// <summary> + /// 鎵瑰噯 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e) + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_itemNo, gridView1); + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + getPageList(1); + } + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } } + /// <summary> + /// 鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) + { + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_itemNo, gridView1); + toolBarMenu1.guidKey = rowGuid; + } + + /// <summary> + /// 瀹℃牳浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) + { + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_itemNo, gridView1); + toolBarMenu1.guidKey = rowGuid; + } /// <summary> /// 鍙栨秷浜嬩欢 /// </summary> @@ -141,7 +209,7 @@ if (_rtn.rtnCode > 0) { UtilityHelper.JumpToTab(xtraTabControl1, 0); - getPageList(1, UtilityHelper.GetPageSize()); + getPageList(1); } MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); } @@ -158,8 +226,19 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { - UtilityHelper.JumpToTab(xtraTabControl1, 0); - getPageList(1, UtilityHelper.GetPageSize()); + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim(), false, 999); + else + { + _filterList.Clear(); + if (gridView1.ActiveFilter.Count > 0) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + } + getPageList(1); + } } /// <summary> @@ -204,11 +283,11 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; - string _ItemId = txt_itemId.GetId() + string _ItemId = txt_ItemId.GetId() ; if (string.IsNullOrEmpty(_ItemId)) { MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�"); - // txt_account.Focus(); + txt_ItemId.Focus(); return; } gvMx1.CloseEditor(); @@ -220,7 +299,7 @@ if (row != null) lst.Add(new MesQmCheckitemDt { - Guid = null, + Guid = UtilityHelper.ToGuid(row["guid"].ToString()), Forder = 1, FcheckItem = row["FcheckItem"].ToString(), SampleSizeNo = row["SampleSizeNo"].ToString(), @@ -228,18 +307,24 @@ FcheckLevel = row["FcheckLevel"].ToString(), Fstand = row["Fstand"].ToString(), FacLevel = row["FacLevel"].ToString(), + FspecRequ = row["FspecRequ"].ToString(), + Memo = row["memo"].ToString(), + FupAllow = row["FupAllow"].ToString(), + FdownAllow = row["FdownAllow"].ToString(), }); } var _obj = new MesQmCheckitem { Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), + ItemId = long.Parse(_ItemId), Memo = txt_memo.Text.Trim(), ItemNo = txt_itemNo.Text.Trim(), - IsEnabled = txt_isenabled.Checked, + Isenabled = txt_isenabled.Checked, + Ftype = "1", + Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()), list = lst }; - try { var strJson = UtilityHelper.HttpPost("", @@ -252,8 +337,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) @@ -266,35 +353,36 @@ /// </summary> /// <param name="curPage">绗嚑椤�</param> /// <param name="pageSize">姣忛〉鍑犳潯</param> - private void getPageList(int curPage, int pageSize) + private async void getPageList(int curPage) { - var _sbSqlWhere = - new StringBuilder(); - foreach (var itm in _filterList) - _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + - itm.fileValue + "'"); + UcLoading _loading = new UcLoading(); + var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); - var pgq = new PageQueryModel(curPage, pageSize, - "create_date", "asc", "", _sbSqlWhere.ToString()); + var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, + "a.create_date", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try { - var strReturn = UtilityHelper.HttpPost("", - _webServiceName + "GetListPageIQC", json); + var strReturn = await UtilityHelper.HttpPostAsync("", + _webServiceName + "GetListPage", json); var dd = UtilityHelper.ReturnToTablePage(strReturn); if (dd.rtnCode > 0) { - var dt = dd.rtnData.list; + DataTable dt = dd.rtnData.list; gcMain.BindingContext = new BindingContext(); - gcMain.DataSource = dt; - gcMain.ForceInitialize(); - var dddd = dd.rtnData.pages; //鎬婚〉 - pageBar1.TotalPages = dddd; - pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟 - pageBar1.CurrentPage = curPage; //褰撳墠椤� - pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず - pageBar1.setTxt(); + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + } + else + UtilityHelper.SetDefaultTable(gcMain, gridView1); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 } else { @@ -305,6 +393,7 @@ { MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } + _loading.Close(); } private void getModel(string strGuid, bool isEdit, int tabIdx) @@ -323,7 +412,8 @@ try { var strJson = UtilityHelper.HttpPost("", - _webServiceName + "GetModelIQC", + // _webServiceName + "GetModelIQC", + _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); @@ -421,11 +511,10 @@ private void _setIno() { - txt_itemId.KeyFile = "id"; - txt_itemId.EditChanged += (s, e) => + txt_ItemId.EditChanged += (s, e) => { - txt_itemModel.Text = this.txt_itemId.GetModel(); - txt_itemNo.Text = this.txt_itemId.GetCode(); + txt_itemModel.Text = this.txt_ItemId.GetModel(); + txt_itemNo.Text = this.txt_ItemId.GetCode(); }; btnSelect.Click += (s, e) => { @@ -505,6 +594,7 @@ foreach (DataRow dr in dt.Rows) { rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString()))); + //rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString()))); //string ddddd = dr["SampleSizeName"].ToString(); } } @@ -524,7 +614,7 @@ "0.010---(AQL_0_0010)" , "0.015---(AQL_0_0015)" , "0.025---(AQL_0_0025)" - ,"0.04---(AQL_0_0040)" + ,"0.040---(AQL_0_0040)" ,"0.065---(AQL_0_0065)" ,"0.10---(AQL_0_010)" ,"0.15---(AQL_0_015)" @@ -563,20 +653,54 @@ ComboBoxEdit comboBox = sender as ComboBoxEdit; if (comboBox != null) { + GridView myView = (gcMx1.MainView as GridView); + int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle); CboItemEntity _itm = comboBox.EditValue as CboItemEntity; string _val = _itm.Value.ToString(); string _txt = _itm.Text.ToString(); gvMx1.CloseEditor(); gvMx1.UpdateCurrentRow(); - GridView myView = (gcMx1.MainView as GridView); - int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle); - myView.SetRowCellValue(dataIndex, "sampleSizeNo", _val); - myView.SetRowCellValue(dataIndex, "sampleSizeName", _txt); + gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val); + gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt); } } - + private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + gvMx1.CloseEditor(); + gvMx1.UpdateCurrentRow(); + var rowhandle = gvMx1.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + var dr = gvMx1.GetDataRow(rowhandle); + 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); + try + { + strJson = UtilityHelper.HttpPost("", + _webServiceName + "DeleteModelMx", + JsonConvert.SerializeObject(lst)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1); + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } #endregion - } } \ No newline at end of file -- Gitblit v1.9.3