From 9702c6a4dc358c7bff2eb18c8426229a0140e34a Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期一, 15 九月 2025 08:29:16 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 42 insertions(+), 5 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs index 2116979..4cdb1bf 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs @@ -34,6 +34,8 @@ toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick; toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; + toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick; + toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -197,7 +199,7 @@ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); }; } - + private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -270,6 +272,25 @@ { _toolCk(3); } + /// <summary> + /// 鍙嶅搧璐� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnPingZhiClick(object sender, EventArgs e) + { + _toolCk(4); + } + /// <summary> + /// 鍝佽川 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e) + { + _toolCk(5); + } + /// <summary> /// 瀹℃牳浜嬩欢 /// </summary> @@ -439,15 +460,21 @@ txt_tbl002.Focus(); return; } - if (string.IsNullOrEmpty(txt_tbl005.Text.Trim())) + if (txt_tbl005.SelectedIndex <= 0) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍘熷洜锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨绫诲瀷锛�"); txt_tbl005.Focus(); return; } if ((txt_tbl005.Text.Trim()=="鑹搧閫�鏂�") && txt_chkOut.Checked) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛岃妫�鏌ワ紒"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒"); + txt_tbl005.Focus(); + return; + } + if ((txt_tbl005.Text.Trim() == "鏉ユ枡涓嶈壇閫�鏂�") && txt_chkOut.Checked) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("鏉ユ枡涓嶈壇閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒"); txt_tbl005.Focus(); return; } @@ -531,7 +558,11 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; + System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); + _sbSqlWhere.Append(" and a.tbl023 in"); + _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); + _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -711,6 +742,12 @@ case 3: strMsg = "鍙嶆壒鍑�"; break; + case 4: + strMsg = "鍝佽川瀹℃牳"; + break; + case 5: + strMsg = "鍝佽川鍙嶅鏍�"; + break; } ; toolBarMenu1.guidKey = ""; -- Gitblit v1.9.3