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 | 449 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 407 insertions(+), 42 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs index a731693..42a9f5a 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs @@ -3,12 +3,14 @@ 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.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; +using MES.Service.Modes; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -29,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) => { @@ -46,8 +56,15 @@ e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; + //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷� + _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> @@ -69,7 +86,7 @@ /// <param name="pageSize"></param> private void PageBar1_PagerEvent(int curPage, int pageSize) { - getPageList(curPage, pageSize); + getPageList(curPage); } /// <summary> @@ -79,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(); } @@ -94,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> @@ -115,14 +187,14 @@ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) { string rowGuid = "", rowName = ""; - // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戠殑妫�楠屾爣鍑嗭紝纭畾鍒犻櫎鍚楋紵")) return; var lst = new List<dynamic>(); lst.Add(rowGuid); @@ -137,9 +209,8 @@ if (_rtn.rtnCode > 0) { UtilityHelper.JumpToTab(xtraTabControl1, 0); - getPageList(1, UtilityHelper.GetPageSize()); + getPageList(1); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) @@ -155,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> @@ -167,13 +249,12 @@ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) { string rowGuid = "", rowName = ""; - // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } - getModel(rowGuid, true, 1); } @@ -202,15 +283,47 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; - //if (string.IsNullOrEmpty(txt_account.Text.Trim())) + string _ItemId = txt_ItemId.GetId() +; if (string.IsNullOrEmpty(_ItemId)) { - MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�"); - // txt_account.Focus(); + MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�"); + txt_ItemId.Focus(); return; } - var _obj = new + gvMx1.CloseEditor(); + gvMx1.UpdateCurrentRow(); + var lst = new List<MesQmCheckitemDt>(); + for (var i = 0; i < gvMx1.DataRowCount; i++) { - guid = lbGuid.Text.Trim() //涓诲缓 + var row = gvMx1.GetDataRow(i); + if (row != null) + lst.Add(new MesQmCheckitemDt + { + Guid = UtilityHelper.ToGuid(row["guid"].ToString()), + Forder = 1, + FcheckItem = row["FcheckItem"].ToString(), + SampleSizeNo = row["SampleSizeNo"].ToString(), + FcheckTool = row["FcheckTool"].ToString(), + 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, + Ftype = "1", + Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()), + list = lst }; try { @@ -224,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) @@ -238,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 { @@ -277,6 +393,7 @@ { MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } + _loading.Close(); } private void getModel(string strGuid, bool isEdit, int tabIdx) @@ -295,7 +412,8 @@ try { var strJson = UtilityHelper.HttpPost("", - _webServiceName + "GetModelIQC", + // _webServiceName + "GetModelIQC", + _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); @@ -337,5 +455,252 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + + + + #region 浠ヤ笅涓虹绉嶄笅鎷� + + private void getCopyMx(string strGuid) + { + if (string.IsNullOrEmpty(strGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺澶嶅埗鐨勮锛�"); + return; + } + var _obj = new + { + guid = strGuid + }; + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "GetModelIQC", + JsonConvert.SerializeObject(_obj)); + var _rtn = + UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + var dy = _rtn.rtnData; + var _job = JObject.Parse(strJson); + var array = new JArray(); + foreach (var a in _job["rtnData"]["list"]) array.Add(a); + var dt = + JsonConvert.DeserializeObject<DataTable>( + array.ToString()); + if (dt.Rows.Count > 0) + { + gcMx1.BindingContext = new BindingContext(); + gcMx1.DataSource = dt; + gcMx1.ForceInitialize(); + } + else + { + MsgHelper.Warning("鎻愮ず锛氭病鎵惧埌鐩稿簲鐨勬槑缁嗭紝璇烽�夋嫨鍏跺畠璇曡瘯锛�"); + } + } + else + { + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + private void _setIno() + { + txt_ItemId.EditChanged += (s, e) => + { + txt_itemModel.Text = this.txt_ItemId.GetModel(); + txt_itemNo.Text = this.txt_ItemId.GetCode(); + }; + btnSelect.Click += (s, e) => + { + var frm = new SelectCheckDt(); + frm.UpdateParent += (ss, ee) => + { + var lst = new List<string>(); + lst = ee.StringList; + getCopyMx(lst[0]); + + }; + frm.ShowDialog(); + }; + _getListJyxm(); + _getListJygj(); + _getListJybz(); + _getListJssp(); + _getListJysp(); + } + /// <summary> + /// 璇诲彇妫�楠岄」鐩� + /// </summary> + private void _getListJyxm() + { + var json = JsonConvert.SerializeObject("QCITEM"); + try + { + var strReturn = UtilityHelper.HttpPost("", "MesSysLookupTypesManager/GetItemList", json); + var dd = UtilityHelper.ReturnToList(strReturn); + var dt = dd.rtnData; + foreach (DataRow dr in dt.Rows) + { + rptJYXM.Items.Add(dr["lookUpName"].ToString()); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// 璇诲彇妫�楠屽伐鍏� + /// </summary> + private void _getListJygj() + { + var json = JsonConvert.SerializeObject("QATOOLS"); + try + { + var strReturn = UtilityHelper.HttpPost("", "MesSysLookupTypesManager/GetItemList", json); + var dd = UtilityHelper.ReturnToList(strReturn); + var dt = dd.rtnData; + foreach (DataRow dr in dt.Rows) + { + rptJYGJ.Items.Add(dr["lookUpName"].ToString()); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + /// <summary> + /// 璇诲彇妫�楠屾爣鍑� + /// </summary> + private void _getListJybz() + { + var pgq = new PageQueryModel(1, 999999, "CREATE_DATE", "asc", "", + " and 1=1"); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", + "MesQmAql1Manager/GetListPage", json); + var rtn = UtilityHelper.ReturnToTablePage(strReturn); + var dt = rtn.rtnData.list; + 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(); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + Close(); + Application.Exit(); + } + } + /// <summary> + /// 璇诲彇鎺ュ彈姘村钩 + /// </summary> + private void _getListJssp() + { + rptJSSP.Items.AddRange(new string[] { + "0.010---(AQL_0_0010)" + , "0.015---(AQL_0_0015)" + , "0.025---(AQL_0_0025)" + ,"0.040---(AQL_0_0040)" + ,"0.065---(AQL_0_0065)" + ,"0.10---(AQL_0_010)" + ,"0.15---(AQL_0_015)" + ,"0.25---(AQL_0_025)" + ,"0.40---(AQL_0_040)" + ,"0.65---(AQL_0_065)" + ,"1.00---(AQL_0_100)" + ,"1.50---(AQL_0_150)" + ,"2.00---(AQL_0_200)" + ,"2.50---(AQL_0_250)" + }); + } + /// <summary> + /// 璇诲彇妫�楠屾按骞� + /// </summary> + private void _getListJysp() + { + rptJYSP.Items.AddRange(new string[] { + "1.涓�鑸楠屾按骞�(I)" + , "2.涓�鑸楠屾按骞�(II)" + ,"3.涓�鑸楠屾按骞�(III)" + ,"4.鐗规畩妫�楠屾按骞�(S1)" + ,"5.鐗规畩妫�楠屾按骞�(S2)" + ,"6.鐗规畩妫�楠屾按骞�(S3)" + ,"7.鐗规畩妫�楠屾按骞�(S4)" + }); + } + + /// <summary> + /// 鍏宠仈妫�楠屾爣鍑嗗悕绉� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e) + { + 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(); + 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