From db9fc85acf9671e936092656e06d809ffe448538 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 13 六月 2025 18:12:08 +0800 Subject: [PATCH] 加上自动生成按钮 --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 136 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 102 insertions(+), 34 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs index 1ca48cf..f384a35 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs @@ -15,6 +15,7 @@ { string _webServiceName = "MesItemTblManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); + string _ucGg = ""; public Frm_MesItemTbl() { InitializeComponent(); @@ -27,23 +28,23 @@ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick; + toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; - List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); - gvList.Add(gridView1); - Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList); + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (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; //璁剧疆缁勭粐 @@ -51,7 +52,7 @@ { string orgdId = txt_tbl023.GetId(); if (string.IsNullOrEmpty(orgdId)) return; - txt_tbl002.getSuppler(orgdId); + txt_tbl002.getSuppler(orgdId, _ucGg); }; //璁剧疆宸ュ崟瀛� txt_tbl002.EditChanged += (s, e) => @@ -60,8 +61,8 @@ if (string.IsNullOrEmpty(daaId)) return; txt_rwd.Text = txt_tbl002.GetRwd(); txt_workName.Text = txt_tbl002.GetWorkName(); - txt_lineName.Text = txt_tbl002.GetPrdName(); - txt_itemName.Text = txt_tbl002.GetPrdModel(); + txt_itemName.Text = txt_tbl002.GetPrdName(); + txt_itemNo.Text = txt_tbl002.GetPrdNo(); }; //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏 btnSelect.Click += (s, e) => @@ -95,6 +96,7 @@ gcMx1.BindingContext = new BindingContext(); gcMx1.DataSource = _oldTable; gcMx1.ForceInitialize(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } catch (Exception ex) { @@ -113,14 +115,14 @@ ucBtnPrint1.guidKey = ""; string rowGuid = lbMxGuid.Text.Trim(); ucBtnPrint1.guidKey = rowGuid; - if (string.IsNullOrEmpty(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; } - if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim())) + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); txt_psnQty_1.Focus(); @@ -135,15 +137,27 @@ } this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim() + "," + "" - + "," + "" + + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim()) + "," + txt_iCount_1.Text.Trim() + "," + txt_psnQty_1.Text.Trim() + "}"; }; + + //鑷姩璁$畻鎵撳嵃閲� + txt_psnQty_1.TextChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); + }; + radOut.SelectedIndexChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); + }; } + + private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); await Task.Delay(100); getPageList(1); } @@ -179,7 +193,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(); } @@ -217,7 +231,7 @@ } if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.toolBarMenu1.rptParameter = "return false"; return; @@ -242,7 +256,25 @@ + "," + txt_psnQty_1.Text.Trim() + "}"; } - + /// <summary> + /// 鎵瑰噯 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e) + { + _toolCk(2); + } + /// <summary> + /// 鍙嶆壒鍑� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnFPiZhunClick(object sender, EventArgs e) + { + _toolCk(3); + } /// <summary> /// 瀹℃牳浜嬩欢 /// </summary> @@ -364,7 +396,7 @@ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); gvList.Add(gvMx2); - UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } } @@ -380,7 +412,7 @@ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gridViews.Add(gvMx1); gridViews.Add(gvMx2); - UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews); + UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); } @@ -441,11 +473,18 @@ MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�"); return; } + _sl = row["tld014"].ToString(); + if (string.IsNullOrEmpty(_sl)) + { + MsgHelper.ShowError("閫�鏂欏娉ㄤ笉鑳戒负绌猴紒"); + return; + } _obj.list.Add(new { Guid = _guid, AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()), - Sl = _sl //鐢宠鏁伴噺 + Sl = _sl, //鐢宠鏁伴噺 + Remark = row["tld014"].ToString() }); } } @@ -462,8 +501,9 @@ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); gvList.Add(gvMx2); - UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); toolBarMenu1.currentAction = ""; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } } catch (Exception ex) @@ -479,7 +519,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 @@ -489,16 +529,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;//褰撳墠椤� @@ -516,6 +556,7 @@ } private void getModel(string strGuid) { + gcMx1.DataSource = null; bool isEdit = false; if (toolBarMenu1.currentAction == "add") return; if (toolBarMenu1.currentAction == "edit") isEdit = true; @@ -535,11 +576,13 @@ if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; + _ucGg = dy.tbl002; lbGuid.Text = strGuid; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); gvList.Add(gvMx2); - UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); + _ucGg = ""; JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) @@ -553,6 +596,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -570,6 +614,7 @@ gcMx2.DataSource = dt2; gcMx2.ForceInitialize(); gvMx2.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2); } else { @@ -655,7 +700,7 @@ try { var strJson = UtilityHelper.HttpPost("", - _webServiceName + "DeleteBarcode", + "VArrivalBarcodeManager/DeleteBarcode", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) @@ -676,6 +721,8 @@ /// <param name="inFieldValue"></param> private void _toolCk(int _inFieldValue) { + + string strMsg = ""; switch (_inFieldValue) { @@ -684,6 +731,12 @@ break; case 0: strMsg = "鍙嶅鏍�"; + break; + case 2: + strMsg = "鎵瑰噯"; + break; + case 3: + strMsg = "鍙嶆壒鍑�"; break; }; toolBarMenu1.guidKey = ""; @@ -707,9 +760,10 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -717,18 +771,21 @@ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); gridView1.FocusedRowHandle = rowHandle; Form parentForm = this.FindForm(); - UtilityHelper.SetCheckIco(gridView1, "isChk", "tbl011", "tbl012", picCheckBox, parentForm, _inFieldValue.ToString()); + if (_inFieldValue < 2) + UtilityHelper.SetCheckIco(gridView1, "isChk", "tbl011", "tbl012", picCheckBox, parentForm, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) { - if (e.FocusedRowHandle >= 0) + if (e.FocusedRowHandle >= 0 && gvMx1.GetDataRow(e.FocusedRowHandle)["tlid"].ToString().Length > 0) { DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); lbMxGuid.Text = row["tlid"].ToString(); @@ -738,9 +795,20 @@ txtWlmc.Text = row["tld003"].ToString(); txtQuantity.Text = row["tld005"].ToString();//鐢宠鎬婚噺 txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 - txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 + txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 + txt_psnQty_1.Text = row["tld005"].ToString(); //榛樿姣忓紶鏉$爜鏁伴噺 + } + else + { + lbMxGuid.Text = ""; + toolBarMenu1.guidKey = ""; + txtWlid.Text = ""; + txtWlgg.Text = ""; + txtWlmc.Text = ""; + txtQuantity.Text = ""; + txtYdy.Text = ""; + txt_kQty.Text = ""; } } - } } \ No newline at end of file -- Gitblit v1.9.3