From 714cba76f99b7a6959b8420cd5a6c54396e0d111 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期三, 18 六月 2025 15:24:11 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 72 +++++++++++++++++++++++++++--------- 1 files changed, 54 insertions(+), 18 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs index 7f15d1a..0aa0e40 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs @@ -1,4 +1,5 @@ using DevExpress.XtraEditors; +using Gs.DevApp.DevFrm.Work; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -84,18 +85,14 @@ } }; gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; - this.ucBtnPrint1.btnDesignClick += (s, e) => - { - ucBtnPrint1.rptParameter = "rpt_Qtrk{}"; - }; - this.ucBtnPrint1.btnReportClick += (s, e) => + this.ucBtnPrint1.btnPrintClick += (s, e) => { ucBtnPrint1.guidKey = ""; string rowGuid = lbMxGuid.Text.Trim(); ucBtnPrint1.guidKey = rowGuid; - if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(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; @@ -205,7 +202,7 @@ { string rowGuid = "", rowName = ""; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_qtck, gridView1, "isSh"); + lbGuid, txt_qtck, gridView1,"qtck"); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); @@ -359,12 +356,12 @@ txt_qt009.Focus(); return; } - if (string.IsNullOrEmpty(kcCk)) - { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀舵枡浠撳簱锛�"); - txt_qt008.Focus(); - return; - } + //if (string.IsNullOrEmpty(kcCk)) + //{ + // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀舵枡浠撳簱锛�"); + // txt_qt008.Focus(); + // return; + //} var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 @@ -377,6 +374,7 @@ kcfx = kcfx,//搴撳瓨鏂瑰悜 hzlx = inHzlx,//璐т富绫诲瀷 inHz = inHz,//璐т富 + inSource = txt_qt035.EditValue,//宸ュ崟鍙� list = new List<dynamic>(), }; gvMx1.CloseEditor(); @@ -404,6 +402,7 @@ ItemId = (row["itemId"].ToString()), Sqsl = (row["qd007"].ToString()), Bz = (row["qd010"].ToString()), + Bllb = (row["qd012"].ToString()), }); } } @@ -474,6 +473,10 @@ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } + /// <summary> + /// 璇诲彇瀹炰綋 + /// </summary> + /// <param name="strGuid"></param> private void getModel(string strGuid) { gcMx1.DataSource = null; @@ -569,7 +572,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; @@ -727,9 +734,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) @@ -767,12 +779,14 @@ } } /// <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; @@ -805,5 +819,27 @@ } } } + + private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gvMx1.FocusedRowHandle; + if (rowhandle < 0) + return; + UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", " a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'"); + frm.UpdateParent += (ss, ee) => + { + System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder(); + var lst = ee.DynamicList; + foreach (dynamic dym in lst) + { + if (stringBuilder.Length > 0) + stringBuilder.Append("|"); + stringBuilder.Append(dym.dicTxt); + } + gvMx1.SetFocusedRowCellValue("qd012", stringBuilder.ToString()); + // this.TextTxt = ; + }; + frm.ShowDialog(); + } } } \ No newline at end of file -- Gitblit v1.9.3