From f295cd95416fa3a141ecf4203fab9dc698cc70e4 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期一, 30 十二月 2024 17:01:23 +0800 Subject: [PATCH] 工单排产 --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 66 ++++++++++++++++++-------------- 1 files changed, 37 insertions(+), 29 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs index 6da5873..8202728 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs @@ -43,12 +43,15 @@ }); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; + txt_erpSczz.EditChanged += (s, e) => { + txt_pba013.getSuppler(txt_erpSczz.GetId()); + }; txt_pba013.EditChanged += (s, e) => { - string workGuid = this.txt_pba013.GetGuid(); + string workGuid = this.txt_pba013.GetId(); _getListJybz(workGuid); }; - //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏 + //閫夋嫨闇�瑕佺殑鏄庣粏 btnSelect.Click += (s, e) => { if (string.IsNullOrEmpty(this.txt_pba013.GetId())) @@ -56,7 +59,7 @@ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒"); return; } - var frm = new SelectWompba(this.txt_pba013.Text); + var frm = new SelectWompba(this.txt_pba013.GetId()); //璧嬪�肩粰鏄庣粏琛� frm.UpdateParent += (ss, ee) => { @@ -88,13 +91,13 @@ frm.ShowDialog(); }; } - private void GridView1_ColumnFilterChanged(object sender, EventArgs e) + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); - Task.Delay(100); + Task.Delay(100); getPageList(1); } - + /// <summary> /// 鍒嗛〉浜嬩欢 /// </summary> @@ -134,7 +137,7 @@ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> - private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) + private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) { _toolCk(1, "EditModelSubmit"); } @@ -145,7 +148,7 @@ /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> - private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) + private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) { _toolCk(0, "EditModelSubmitFSH"); } @@ -239,9 +242,16 @@ return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); - List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); - gvList.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList); + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + 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); + } } /// <summary> /// 鏂板浜嬩欢 @@ -252,8 +262,11 @@ { lbGuid.Text = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); - UtilityHelper.CleanValueByControl(panel1.Controls, true); + List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gridViews.Add(gvMx1); + UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } /// <summary> /// 淇濆瓨浜嬩欢 @@ -378,7 +391,7 @@ /// </summary> /// <param name="curPage">绗嚑椤�</param> /// <param name="pageSize">姣忛〉鍑犳潯</param> - private void getPageList(int curPage) + private void getPageList(int curPage) { var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); @@ -414,12 +427,13 @@ { ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } - + } private void getModel(string strGuid) { bool isEdit = false; - if (toolBarMenu1.currentAction == "add") { + if (toolBarMenu1.currentAction == "add") + { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); return; }; @@ -517,22 +531,17 @@ /// <param name="workGuid"></param> private void _getListJybz(string workGuid) { + rptJYBZ.Items.Clear(); if (string.IsNullOrEmpty(workGuid)) return; - var _obj = new - { - guid = workGuid //涓诲缓 - }; - var json = JsonConvert.SerializeObject(_obj); + var _sbSqlWhere = " and 1=1 and dpt_id="+ workGuid; + var pgq = new PageQueryModel(1, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString()); + var json = JsonConvert.SerializeObject(pgq); try { - var strReturn = UtilityHelper.HttpPost("", - "SysDepartmentManager/GetModel", json); - var _job = JObject.Parse(strReturn); - var array = new JArray(); - var d = _job["rtnData"]["list"]; - foreach (var a in d) array.Add(a); - var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); + var strReturn = UtilityHelper.HttpPost("", "MesWorkshopLineManager/GetListPage", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + DataTable dt = dd.rtnData.list; foreach (DataRow dr in dt.Rows) { rptJYBZ.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString()))); @@ -561,12 +570,11 @@ } } - /// <summary> /// 宸ュ叿鏉′簨浠� /// </summary> /// <param name="inFieldValue"></param> - private void _toolCk(int _inFieldValue,string _mth) + private void _toolCk(int _inFieldValue, string _mth) { string strMsg = ""; switch (_inFieldValue) -- Gitblit v1.9.3