From 98e93a53c3407b9785eba27faec13fe7afc1255b Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 20 六月 2025 16:55:46 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 317 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 241 insertions(+), 76 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs index 2f106f0..0146b7c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs @@ -16,6 +16,11 @@ { string _webServiceName = "MesItemQtManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); + string _ucKh = "";//棰嗘枡瀹㈡埛 + string _ucBm = "";//棰嗘枡閮ㄩ棬 + string _ucCk = "";//鍙戞枡浠撳簱 + string _ucHzlx = "";//璐т富绫诲瀷 + string _ucHz = "";//璐т富 public Frm_MesItemQt() { InitializeComponent(); @@ -26,41 +31,47 @@ 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; + toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick; + toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick; + toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick; + toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick; + toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick; + toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick; + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); - Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qt015", "", (value) => - { - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); - }); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) => + { + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); + }, tips); Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => { getModel(value); }, (value) => { getPageList(this.pageBar1.CurrentPage); - }); + }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - //璁剧疆鍙戞枡缁勭粐 + //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜屽彉璐т富锛� txt_qt023.EditChanged += (s, e) => { string _orgId = txt_qt023.GetId(); if (string.IsNullOrEmpty(_orgId)) return; - txt_qt008.getSuppler(_orgId); - var _obj = new - { - currentPage = 1, - everyPageSize = 999999, - sortName = "", - keyWhere = "", - }; + ucLookHuoZhu1.OrgId = _orgId; + ucLookHuoZhu1.HzId = _ucHz; + ucLookHuoZhu1.SetHzLx(_ucHzlx); + txt_qt008.getSuppler(_orgId, _ucCk); + System.Text.StringBuilder sbWhere = new System.Text.StringBuilder(); + sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'"); + var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), ""); var json = JsonConvert.SerializeObject(_obj); try { - var strReturn = UtilityHelper.HttpPost("", - "MesItemsManager/GetListSelect", json); + var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json); var rtn = UtilityHelper.ReturnToTablePage(strReturn); var dt = rtn.rtnData.list; this.repositoryItemSearchLookUpEdit1.DataSource = dt; @@ -70,29 +81,49 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } }; - //璁剧疆鍙戞枡浠撳簱 - //txt_qt008.getSuppler(""); - this.txt_qt008.EditChanged += (s, e) => - { - string _ckId = txt_qt008.GetId(); - if (string.IsNullOrEmpty(_ckId)) - return; - }; - //璁剧疆棰嗙敤 + //閫夋嫨棰嗙敤缁勭粐 txt_qt024.EditChanged += (s, e) => { string _orgId = txt_qt024.GetId(); if (string.IsNullOrEmpty(_orgId)) return; - //txt_qt018.getSuppler(_orgId); - //txt_qt009.getSuppler(_orgId); + txt_qt013.getSuppler(_orgId, _ucKh); + txt_qt009.getSuppler(_orgId, _ucBm); + }; + //閫夋嫨srm鏄庣粏 + txt_qt035.ButtonClick += (s, e) => + { + string strSrmNo = ""; + SelectDaa frm = new SelectDaa(); + frm.UpdateParent += (ss, ee) => + { + var lst = new List<dynamic>(); + lst = ee.DynamicList; + strSrmNo = lst[0].guid; + txt_qt035.Text = strSrmNo; + }; + frm.ShowDialog(); }; } + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); Task.Delay(100); getPageList(1); + } + /// <summary> + /// 鏃ュ織 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnLogClick(object sender, EventArgs e) + { + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_qtck, gridView1); + toolBarMenu1.guidKey = rowGuid; } /// <summary> /// 鍒嗛〉浜嬩欢 @@ -113,7 +144,7 @@ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - var frm = new ShowFilter(gridView1.Columns, _filterList); + var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } @@ -154,13 +185,17 @@ } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) return; - List<dynamic> lst = new List<dynamic>(); - lst.Add(rowGuid); - var _obj = lst; + var _obj = new + { + guid = rowGuid, + mxGuid = Guid.Empty.ToString(), + }; try { - string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); - ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "DeleteModelOrMx", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 0) @@ -169,6 +204,7 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { @@ -215,13 +251,14 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { - getModel(lbGuid.Text.Trim()); + getModel(rowGuid); } else { List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); + ucLookHuoZhu1.Enabled = true; } } /// <summary> @@ -235,8 +272,13 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gridViews.Add(gvMx1); - UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews); + UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + ucLookHuoZhu1.Enabled = true; + + //澧炲姞鏃讹紝榛樿缁勭粐 + string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023); + string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024); } /// <summary> /// 淇濆瓨浜嬩欢 @@ -246,18 +288,39 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; - string inOrgId = txt_qt023.GetId();//鍙戞枡缁勭粐 - string inCkId = txt_qt008.GetId();//鍙戞枡浠撳簱 + string inOrgId = txt_qt023.GetId();//搴撳瓨缁勭粐 + string inHzlx = ucLookHuoZhu1.GetHzLx();//璐т富绫诲瀷 + string inHz = ucLookHuoZhu1.GetHzId();//璐т富 + string inRkyy = txt_qt010.Text.Trim();//鍘熷洜 + string inDjlx = txt_qt019.Text.Trim();//鍗曟嵁绫诲瀷 string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐 - string inLyCus = txt_qt018.GetId();//棰嗙敤瀹㈡埛 - string inLyDepart = txt_qt018_1.GetId();//棰嗙敤閮ㄩ棬 + string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛 + string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬 + string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜 + string inFlck = txt_qt008.GetId();//鍙戞枡浠撳簱 if (string.IsNullOrEmpty(inOrgId)) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡缁勭粐锛�"); + Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�"); txt_qt023.Focus(); return; } - if (string.IsNullOrEmpty(inCkId)) + if (string.IsNullOrEmpty(inHzlx)) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富绫诲瀷锛�"); + return; + } + if (string.IsNullOrEmpty(inHz)) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富锛�"); + return; + } + if (txt_qt019.SelectedIndex <= 0) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�"); + txt_qt019.Focus(); + return; + } + if (string.IsNullOrEmpty(inFlck)) { Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡浠撳簱锛�"); txt_qt008.Focus(); @@ -274,17 +337,6 @@ Gs.DevApp.ToolBox.MsgHelper.Warning("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒"); return; } - if (!string.IsNullOrEmpty(inLyCus) && !string.IsNullOrEmpty(inLyDepart)) - { - Gs.DevApp.ToolBox.MsgHelper.Warning("瀹㈡埛鎴栭儴闂ㄥ彧閫変竴涓紒"); - return; - } - if (txt_qt019.SelectedIndex <= 0) - { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�"); - txt_qt019.Focus(); - return; - } if (txt_qt020.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�"); @@ -294,17 +346,21 @@ var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 - inDjlx = txt_qt019.Text.Trim(),//鍗曟嵁绫诲瀷 - inKcfx = txt_qt020.Text.Trim(),//搴撳瓨鏂瑰悜 - inOrgId = inOrgId,//鍙戞枡缁勭粐 - inCkId = inCkId,//鍙戞枡浠撳簱 + inOrgId = inOrgId,//搴撳瓨缁勭粐 + inHzlx = inHzlx,//璐т富绫诲瀷 + inHz = inHz,//璐т富 + inRkyy = inRkyy,//鍘熷洜 + inDjlx = inDjlx,//鍗曟嵁绫诲瀷 inLyOrg = inLyOrg,//棰嗙敤缁勭粐 - inHzlx = txt_qt025.Text.Trim(),//璐т富绫诲瀷 - inLyCusOrDpt = inLyCus,//璐т富瀹㈡埛鎴栭儴闂� - inRkyy = txt_qt010.Text.Trim(),//鍘熷洜 + inLyCus = inLyCus,//棰嗙敤瀹㈡埛 + inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬 + inKcfx = inKcfx,//搴撳瓨鏂瑰悜 + inFlck = inFlck,//鍙戞枡浠撳簱 + inSource = txt_qt035.EditValue,//宸ュ崟鍙� list = new List<dynamic>(), }; gvMx1.CloseEditor(); + gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); if (gvMx1.DataRowCount <= 0) { @@ -339,9 +395,15 @@ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { - lbGuid.Text = _rtn.rtnData; + lbGuid.Text = _rtn.rtnData.outGuid; + txt_qtck.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; - UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx1); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); + ucLookHuoZhu1.Enabled = false; + toolBarMenu1.currentAction = ""; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } } catch (Exception ex) @@ -357,7 +419,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, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -367,16 +429,16 @@ if (dd.rtnCode > 0) { DataTable dt = dd.rtnData.list; - gcMain.BindingContext = new BindingContext(); + gcMain1.BindingContext = new BindingContext(); gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; if (dt.Rows.Count > 0) { - gcMain.DataSource = dt; - gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gcMain1.DataSource = dt; + gcMain1.ForceInitialize(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else - UtilityHelper.SetDefaultTable(gcMain, gridView1); + UtilityHelper.SetDefaultTable(gcMain1, gridView1); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 pageBar1.CurrentPage = curPage;//褰撳墠椤� @@ -393,6 +455,11 @@ } } + + /// <summary> + /// 璇诲彇 + /// </summary> + /// <param name="strGuid"></param> private void getModel(string strGuid) { bool isEdit = false; @@ -414,10 +481,21 @@ if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; + _ucKh = dy.qt013; + _ucBm = dy.qt009; + _ucCk = dy.qt008; + _ucHzlx = dy.qt025; + _ucHz = dy.qt018; lbGuid.Text = strGuid; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); - UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); + _ucKh = ""; + _ucBm = ""; + _ucCk = ""; + _ucHzlx = ""; + _ucHz = ""; + ucLookHuoZhu1.Enabled = isEdit; JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) @@ -431,6 +509,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -469,6 +548,68 @@ } /// <summary> + /// 鍞悗瀹℃牳 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnShouHouChkClick(object sender, EventArgs e) + { + _toolCk(20); + } + + /// <summary> + /// 鍞悗鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnShouHouFchkClick(object sender, EventArgs e) + { + _toolCk(21); + } + + /// <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> /// <param name="inFieldValue"></param> @@ -483,6 +624,24 @@ case 0: strMsg = "鍙嶅鏍�"; break; + case 20: + strMsg = "鍞悗瀹℃牳"; + break; + case 21: + strMsg = "鍞悗鍙嶅鏍�"; + break; + case 30: + strMsg = "璐㈠姟瀹℃牳"; + break; + case 31: + strMsg = "璐㈠姟鍙嶅鏍�"; + break; + case 40: + strMsg = "閲囪喘瀹℃牳"; + break; + case 41: + strMsg = "閲囪喘鍙嶅鏍�"; + break; }; toolBarMenu1.guidKey = ""; string rowGuid, rowName; @@ -494,7 +653,6 @@ } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) return; - var _obj = new { guid = rowGuid, @@ -507,19 +665,21 @@ JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); - if (_rtn.rtnCode > 0) + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) + { getModel(lbGuid.Text.Trim()); - else - getPageList(this.pageBar1.CurrentPage); + } + int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + gridView1.FocusedRowHandle = rowHandle; + UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString()); } } catch (Exception ex) { MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } - } private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e) { @@ -529,8 +689,13 @@ gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]); gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]); gvMx1.SetFocusedRowCellValue("qd009", 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; -- Gitblit v1.9.3