From 34e30e2261a057fc9f46f67a3d216e3d9a9e67be Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 03 六月 2025 17:17:21 +0800 Subject: [PATCH] 上线梳理 --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 136 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 116 insertions(+), 20 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs index 16972f4..d8e2793 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs @@ -30,16 +30,20 @@ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; - toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; - toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; - toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + this.toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; + this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; + this.toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + this.toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick; + this.toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick; + this.toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick; + this.toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isSh", "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); - }); + }, tips); Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => { getModel(value); @@ -89,14 +93,14 @@ ucBtnPrint1.guidKey = ""; string rowGuid = lbMxGuid.Text.Trim(); ucBtnPrint1.guidKey = rowGuid; - if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim())) + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; } - if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim())) + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); txt_psnQty_1.Focus(); @@ -111,12 +115,24 @@ } this.ucBtnPrint1.rptParameter = "rpt_Qtrk{" + lbMxGuid.Text.Trim() + "," + "" - + "," + "" + + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim()) + "," + txt_iCount_1.Text.Trim() + "," + txt_psnQty_1.Text.Trim() + "}"; }; + + //鑷姩璁$畻鎵撳嵃閲� + txt_psnQty_1.TextChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); + }; + + radOut.SelectedIndexChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); + }; } + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -156,7 +172,7 @@ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); + var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } @@ -189,7 +205,7 @@ { string rowGuid = "", rowName = ""; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_qtck, gridView1, "qtck"); + lbGuid, txt_qtck, gridView1, "isSh"); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); @@ -303,7 +319,7 @@ string kcZz = txt_qt022.GetId();//搴撳瓨缁勭粐 string kcBm = txt_qt009.GetId();//搴撳瓨閮ㄩ棬 string kcGys = txt_qt018.GetId();//搴撳瓨渚涘簲鍟� - string djLx = txt_qt003.Text.Trim();//鍗曟嵁绫诲瀷 + string djLx = txt_qt003.TextTxt.Trim();//鍗曟嵁绫诲瀷 string kcfx = txt_qt019.Text.Trim();//搴撳瓨鏂瑰悜 string inHzlx = ucLookHuoZhu1.GetHzLx();//璐т富绫诲瀷 string inHz = ucLookHuoZhu1.GetHzId();//璐т富 @@ -325,7 +341,7 @@ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富锛�"); return; } - if (txt_qt003.SelectedIndex < 0) + if (txt_qt003.TextTxt.Length < 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�"); txt_qt003.Focus(); @@ -423,7 +439,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "qt001", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -458,6 +474,10 @@ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } + /// <summary> + /// 璇诲彇瀹炰綋 + /// </summary> + /// <param name="strGuid"></param> private void getModel(string strGuid) { gcMx1.DataSource = null; @@ -509,7 +529,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); - Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -553,7 +573,11 @@ gvMx1.SetFocusedRowCellValue("kcDw", SelectedDataRow["dwName"]); gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]); } - + /// <summary> + /// 绉诲嚭鏄庣粏 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gvMx1.FocusedRowHandle; @@ -614,7 +638,46 @@ { _toolCk(0); } + /// <summary> + /// 璐㈠姟瀹℃牳 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnCaiWuChkClick(object sender, EventArgs e) + { + _toolCk(30); + } + /// <summary> + /// 璐㈠姟鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnCaiWuFchkClick(object sender, EventArgs e) + { + _toolCk(31); + } + /// <summary> + /// 閲囪喘瀹℃牳 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnCaiGouChkClick(object sender, EventArgs e) + { + _toolCk(40); + } + /// <summary> + /// 閲囪喘鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + + private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e) + { + _toolCk(41); + } /// <summary> /// 宸ュ叿鏉′簨浠� /// </summary> @@ -629,6 +692,18 @@ break; case 0: strMsg = "鍙嶅鏍�"; + break; + case 30: + strMsg = "璐㈠姟瀹℃牳"; + break; + case 31: + strMsg = "璐㈠姟鍙嶅鏍�"; + break; + case 40: + strMsg = "閲囪喘瀹℃牳"; + break; + case 41: + strMsg = "閲囪喘鍙嶅鏍�"; break; }; toolBarMenu1.guidKey = ""; @@ -660,9 +735,14 @@ { getModel(lbGuid.Text.Trim()); } - int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + //int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + //gridView1.FocusedRowHandle = rowHandle; + //UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString()); + + //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍� + getPageList(this.pageBar1.CurrentPage); + int rowHandle = gridView1.LocateByValue("guid", rowGuid); gridView1.FocusedRowHandle = rowHandle; - UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString()); } } catch (Exception ex) @@ -672,6 +752,7 @@ } private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) { + if (e.FocusedRowHandle >= 0) { DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); @@ -681,17 +762,32 @@ txtWlgg.Text = row["qd004"].ToString(); txtWlmc.Text = row["qd003"].ToString(); txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺 - txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 - txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 + txt_yQty.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 + txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 + } + else + { + lbMxGuid.Text = ""; + ucBtnPrint1.guidKey = ""; + txtWlid.Text = ""; + txtWlgg.Text = ""; + txtWlmc.Text = ""; + txtQuantity.Text = ""; + txt_yQty.Text = ""; + txt_kQty.Text = ""; + txt_psnQty_1.Text = ""; + txt_iCount_1.Text = ""; } } /// <summary> - /// 绉诲嚭鏉$爜 + /// 閲嶆墦鏉$爜 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { + MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�"); + return; var rowhandle = gvMx2.FocusedRowHandle; if (rowhandle < 0) return; -- Gitblit v1.9.3