From d0f32cf641c751e6b926d2169fc1b17c155c6c82 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期四, 31 七月 2025 15:43:51 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 104 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 69 insertions(+), 35 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs index 01ad6ef..cf3c5f1 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs @@ -1,6 +1,8 @@ 锘縰sing DevExpress.Utils.MVVM.Services; +using DevExpress.XtraGrid.Views.Base.ViewInfo; using DevExpress.XtraGrid.Views.Grid; using DevExpress.XtraLayout.Customization; +using DevExpress.XtraPivotGrid.Data; using DevExpress.XtraRichEdit.Model; using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.Entity; @@ -26,10 +28,11 @@ InitializeComponent(); toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); - Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "docStusTxt", "", (value) => + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fgCheckStatusChk", "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); }, tips); @@ -42,34 +45,6 @@ }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - //纭畾鍙嶅伐 - btnZsm.Click += (s, e) => - { - if (!MsgHelper.AskQuestion("纭畾鐢熸垚鏂扮殑杩芥函鐮佸悧锛�")) - return; - var _obj = new - { - guid = lbGuid.Text.Trim(), - }; - try - { - var strJson = UtilityHelper.HttpPost("", - _webServiceName + "CreateTrace", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); - getModel(lbGuid.Text.Trim()); - } - else - MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); - } - }; //杩欐槸鎵撳嵃锛岃繖鍜屽叾瀹冮〉闈㈡槸涓嶄竴鏍风殑锛屼笉鑳藉鍒惰繖閲� this.ucBtnPrint98.SetPrintButton(false); this.ucBtnPrint98.btnAllClick += (s, e) => @@ -119,6 +94,48 @@ }; } + private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) + { + string strMsg = "瀹℃牳"; + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo"); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) + return; + var _obj = new + { + guid = rowGuid, + }; + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "CreateTrace", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + MsgHelper.ShowInformation(_rtn.rtnMsg); + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + getModel(lbGuid.Text.Trim()); + } + int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + gridView1.FocusedRowHandle = rowHandle; + UtilityHelper.SetCheckIco(gridView1, "fgCheckStatusChk", "fgCheckBy", "fgCheckDatet", picCheckBox, this, 1.ToString()); + } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); + } + } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -226,7 +243,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -240,7 +257,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -293,18 +310,35 @@ { UtilityHelper.SetDefaultTable(gcMx2, gvMx2); } + + JArray array7 = new JArray(); + foreach (var a in _job["rtnData"]["list3"]) + { + array7.Add(a); + } + DataTable dt7 = JsonConvert.DeserializeObject<DataTable>(array7.ToString()); + if (dt7.Rows.Count > 0) + { + gcMx7.BindingContext = new BindingContext(); + gcMx7.DataSource = dt7; + gcMx7.ForceInitialize(); + gvMx7.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx7); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx7, gvMx7); + } } else { - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } - - } } \ No newline at end of file -- Gitblit v1.9.3