From ccbe3fad6c7ebb9c1e936163c7f04cb469ff32fc Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 19 六月 2025 17:08:59 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 88 +++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 49 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs index 47bf48f..58bc09a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs @@ -1,3 +1,4 @@ +using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -36,16 +37,11 @@ }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - //璁剧疆鎵撳嵃 - this.ucBtnPrint1.btnDesignClick += (s, e) => - { - ucBtnPrint1.rptParameter = "rpt_Arrival{}"; - }; - this.ucBtnPrint1.btnReportClick += (s, e) => + this.ucBtnPrint1.btnPrintClick += (s, e) => { 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("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); @@ -73,6 +69,39 @@ + "}"; txt_iCount_1.Text = ""; txt_psnQty_1.Text = ""; + }; + this.ucBtnPrint1.btnAllClick += (s, e) => + { + string rowGuid = lbMxGuid.Text.Trim(); + SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "閲囪喘鍏ュ簱"); + string strCodeList = ""; + frm.UpdateParent += (ss, ee) => + { + strCodeList = ee.StringSingle; + }; + frm.ShowDialog(); + if (string.IsNullOrEmpty(strCodeList)) + return; + try + { + string rptParameter = "rpt_Arrival{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); + } + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } }; gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; //鑷姩璁$畻鎵撳嵃閲� @@ -103,6 +132,7 @@ txtQuantity.Text = row["quantity"].ToString();//鏈鏀惰揣鎬婚噺 txt_yQty.Text = row["yQty"].ToString();//宸叉墦鍗版�婚噺 txt_kQty.Text = row["kQty"].ToString(); //鍙墦鍗版�婚噺 + txt_psnQty_1.Text = row["mrtmsl"].ToString(); //榛樿姣忓紶鏉$爜鏁伴噺 } else { @@ -181,7 +211,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); @@ -291,46 +321,6 @@ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } - /// <summary> - /// 閲嶆墦 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) - { - MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�"); - return; - var rowhandle = gvMx2.FocusedRowHandle; - if (rowhandle < 0) - return; - if (e.Button.Index == 0) - { - var dr = gvMx2.GetDataRow(rowhandle); - var mxGuid = dr["guid"].ToString(); - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) - return; - var _obj = new - { - mxGuid = mxGuid, - inType = "dhtm" - }; - try - { - var strJson = UtilityHelper.HttpPost("", - _webServiceName + "DeleteBarcode", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - } + } } \ No newline at end of file -- Gitblit v1.9.3