From d35bb711f8d3d267b44b4a80c20e31dabf309ae7 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 14 一月 2025 08:17:18 +0800 Subject: [PATCH] 其它入库 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 448 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 228 insertions(+), 220 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs index 42a9f5a..a61d089 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Data; -using System.Drawing; -using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraEditors; @@ -32,51 +30,49 @@ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; - toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick; - gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; - gridView1.FocusedRowChanged += (s, e) => + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) => { - UtilityHelper.SetCheckIco(s, picCheckBox, this, "foneChecked", ""); - }; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); + }); + Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => + { + getModel(value); + }, (value) => + { + getPageList(this.pageBar1.CurrentPage); + }); getPageList(1); - Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); pageBar1.PagerEvent += PageBar1_PagerEvent; - gridView1.CustomDrawRowIndicator += (s, e) => - { - if (e.Info.IsRowIndicator && e.RowHandle >= 0) - e.Info.DisplayText = (e.RowHandle + 1).ToString(); - }; - gridView1.CustomDrawEmptyForeground += (s, e) => - { - var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!"; - var f = new Font("寰蒋闆呴粦", 16); - var r = new Rectangle( - gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, - e.Bounds.Right - 5, e.Bounds.Height - 5); - e.Graphics.DrawString(str, f, Brushes.Gray, r); - }; - //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷� _setIno(); + btnSelect.Click += (s, e) => + { + var frm = new SelectCheckDt("jyxm"); + frm.UpdateParent += (ss, ee) => + { + var lst = ee.DynamicList; + var json = JsonConvert.SerializeObject(lst); + DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable))); + DataTable _oldTable = (DataTable)gridControl2.DataSource; + DataRow[] sourceRows = _newTable.Select(); + for (int i = 0; i < sourceRows.Length; i++) + { + _oldTable.ImportRow(sourceRows[i]); + } + gridControl2.BindingContext = new BindingContext(); + gridControl2.DataSource = _oldTable; + gridControl2.ForceInitialize(); + }; + frm.ShowDialog(); + }; + btnSave.Click += BtnSave_Click; } - private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); - await Task.Delay(100); + Task.Delay(100); getPageList(1); - } - /// <summary> - /// 鍙屽嚮浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e) - { - var rowGuid = - UtilityHelper.GetCurrentDoubleRow(gridView1, - e, "guid"); - if (!string.IsNullOrEmpty(rowGuid)) - getModel(rowGuid, false, 999); } /// <summary> @@ -121,39 +117,7 @@ /// <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; + _toolCk(2); } /// <summary> @@ -163,11 +127,7 @@ /// <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; + _toolCk(1); } /// <summary> /// 鍙栨秷浜嬩欢 @@ -186,37 +146,7 @@ /// <param name="e"></param> private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) { - string rowGuid = "", rowName = ""; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, 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); - } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } + _toolCk(-1); } /// <summary> @@ -227,7 +157,7 @@ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { if (xtraTabControl1.SelectedTabPageIndex == 1) - getModel(lbGuid.Text.Trim(), false, 999); + getModel(lbGuid.Text.Trim()); else { _filterList.Clear(); @@ -255,7 +185,18 @@ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } - getModel(rowGuid, true, 1); + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + getModel(rowGuid); + } + else + { + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx1); + gvList.Add(gridView2); + UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList); + } } /// <summary> @@ -265,14 +206,14 @@ /// <param name="e"></param> private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) { - UtilityHelper.JumpToTab(xtraTabControl1, 1); lbGuid.Text = ""; - var gridViews = - new List<GridView>(); + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); + var gridViews = new List<GridView>(); gridViews.Add(gvMx1); - UtilityHelper.CleanValueByControl(panel1.Controls, true, - gridViews); + gridViews.Add(gridView2); + UtilityHelper.CleanValueByControl(panel1.Controls, true, gridViews); UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + xtraTabPageCopy.PageEnabled = false; } /// <summary> @@ -283,8 +224,8 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; - string _ItemId = txt_ItemId.GetId() -; if (string.IsNullOrEmpty(_ItemId)) + string _ItemId = txt_ItemId.GetId(); + if (string.IsNullOrEmpty(_ItemId)) { MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�"); txt_ItemId.Focus(); @@ -292,78 +233,83 @@ } gvMx1.CloseEditor(); gvMx1.UpdateCurrentRow(); - var lst = new List<MesQmCheckitemDt>(); - for (var i = 0; i < gvMx1.DataRowCount; i++) - { - 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 { - var strJson = UtilityHelper.HttpPost("", - _webServiceName + "EditModel", - JsonConvert.SerializeObject(_obj)); - var _rtn = - UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - if (_rtn.rtnCode > 0) + var lst = new List<MesQmCheckitemDt>(); + for (var i = 0; i < gvMx1.DataRowCount; i++) { - lbGuid.Text = _rtn.rtnData; - toolBarMenu1.isSetBtn = true; - var gridViews = new List<GridView>(); - gridViews.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(panel1.Controls, false, - gridViews); + var row = gvMx1.GetDataRow(i); + if (row != null) + lst.Add(new MesQmCheckitemDt + { + Guid = UtilityHelper.ToGuid(row["guid"].ToString()), + Forder = int.Parse(row["forder"].ToString()), + 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(), + Ftype = "1", + Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()), + list = lst + }; + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "EditModel", + JsonConvert.SerializeObject(_obj)); + var _rtn = + UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + lbGuid.Text = _rtn.rtnData; + toolBarMenu1.isSetBtn = true; + var gridViews = new List<GridView>(); + gridViews.Add(gvMx1); + gridViews.Add(gridView2); + UtilityHelper.ChangeEnableByControl(panel1.Controls, false, gridViews); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } + } /// <summary> /// </summary> /// <param name="curPage">绗嚑椤�</param> /// <param name="pageSize">姣忛〉鍑犳潯</param> - private async void getPageList(int curPage) + private void getPageList(int curPage) { - UcLoading _loading = new UcLoading(); var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); - + _sbSqlWhere += " and b.guid is not null"; var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try { - var strReturn = await UtilityHelper.HttpPostAsync("", + var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json); var dd = UtilityHelper.ReturnToTablePage(strReturn); @@ -393,18 +339,20 @@ { MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } - _loading.Close(); + } - private void getModel(string strGuid, bool isEdit, int tabIdx) + private void getModel(string strGuid) { + bool isEdit = false; + if (toolBarMenu1.currentAction == "add") return; + if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } - - UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); + xtraTabPageCopy.PageEnabled = !isEdit; var _obj = new { guid = strGuid //涓诲缓 @@ -412,7 +360,6 @@ try { var strJson = UtilityHelper.HttpPost("", - // _webServiceName + "GetModelIQC", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); var _rtn = @@ -429,7 +376,6 @@ 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()); @@ -441,9 +387,9 @@ } else { - UtilityHelper.SetDefaultTable(gcMx1, - gvMx1); + UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } + UtilityHelper.SetDefaultTable(gridControl2, gridView2); } else { @@ -456,59 +402,65 @@ } } - - - #region 浠ヤ笅涓虹绉嶄笅鎷� - - private void getCopyMx(string strGuid) + /// <summary> + /// 宸ュ叿鏉′簨浠� + /// </summary> + /// <param name="inFieldValue"></param> + private void _toolCk(int _inFieldValue) { - if (string.IsNullOrEmpty(strGuid)) + string strMsg = ""; + switch (_inFieldValue) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺澶嶅埗鐨勮锛�"); + case -1: + strMsg = "鍒犻櫎"; + break; + case 1: + strMsg = "瀹℃牳"; + break; + case 2: + strMsg = "鎵瑰噯"; + break; + }; + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo"); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) + return; + var _obj = new { - guid = strGuid + guid = rowGuid, + inFieldValue = _inFieldValue, }; try { var strJson = UtilityHelper.HttpPost("", - _webServiceName + "GetModelIQC", + _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); - var _rtn = - UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 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(); - } + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim()); else - { - MsgHelper.Warning("鎻愮ず锛氭病鎵惧埌鐩稿簲鐨勬槑缁嗭紝璇烽�夋嫨鍏跺畠璇曡瘯锛�"); - } - } - else - { - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + getPageList(this.pageBar1.CurrentPage); } } catch (Exception ex) { MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } + } + + #region 浠ヤ笅涓虹绉嶄笅鎷� private void _setIno() { txt_ItemId.EditChanged += (s, e) => @@ -516,18 +468,7 @@ 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(); @@ -691,7 +632,7 @@ _webServiceName + "DeleteModelMx", JsonConvert.SerializeObject(lst)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1); + if (_rtn.rtnCode > 0) getModel(lbGuid.Text); MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) @@ -701,6 +642,73 @@ } } #endregion + /// <summary> + /// 鍒犻櫎澶嶅埗椤� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + gridView2.CloseEditor(); + gridView2.UpdateCurrentRow(); + var rowhandle = gridView2.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + var dr = gridView2.GetDataRow(rowhandle); + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) + return; + gridView2.DeleteRow(rowhandle); + return; + } + } + /// <summary> + /// 鎻愪氦鐗╂枡澶嶅埗 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void BtnSave_Click(object sender, EventArgs e) + { + int _rows = gridView2.RowCount; + if (_rows <= 0) + { + MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); + return; + } + + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵")) + return; + System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder(); + for (var i = 0; i < gridView2.DataRowCount; i++) + { + var row = gridView2.GetDataRow(i); + if (_sbGuids.Length > 0) + _sbGuids.Append(","); + Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString()); + _sbGuids.Append(_guid.ToString()); + } + var _obj = new + { + sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), + itemGuids = _sbGuids.ToString() + }; + try + { + var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + UtilityHelper.SetDefaultTable(gridControl2, gridView2); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } } } \ No newline at end of file -- Gitblit v1.9.3