From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 06 三月 2025 08:13:37 +0800 Subject: [PATCH] 版面 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 119 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 98 insertions(+), 21 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs index bdb262f..78f5ba8 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs @@ -29,6 +29,7 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) => { @@ -44,15 +45,15 @@ getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; // 璁剧疆閿�鍞崟 - txt_customerOrderNo.getSuppler("", ""); - this.txt_customerOrderNo.EditChanged += (s, e) => + txt_salesOrderId.getSuppler("", ""); + this.txt_salesOrderId.EditChanged += (s, e) => { //鏈夋病鏈夐攢鍞鍗� - string _sqGuid = txt_customerOrderNo.GetId(); + string _sqGuid = txt_salesOrderId.GetId(); if (string.IsNullOrEmpty(_sqGuid)) return; - txt_returnCustomer.Text = txt_customerOrderNo.GetSalesCusName(); - txt_salesOrg.Text = txt_customerOrderNo.GetSalesOrgName(); + txt_custName.Text = txt_salesOrderId.GetSalesCusName(); + txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName(); System.Text.StringBuilder sbWhere = new System.Text.StringBuilder(); var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid); var json = JsonConvert.SerializeObject(_obj); @@ -69,8 +70,44 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } }; + gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; + this.ucBtnPrint1.btnDesignClick += (s, e) => + { + ucBtnPrint1.rptParameter = "rpt_Xsth{}"; + }; + this.ucBtnPrint1.btnReportClick += (s, e) => + { + ucBtnPrint1.guidKey = ""; + string rowGuid = lbMxGuid.Text.Trim(); + ucBtnPrint1.guidKey = rowGuid; + if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + txt_iCount_1.Focus(); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); + txt_psnQty_1.Focus(); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + if (lbMxGuid.Text.Trim().Length < 10) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�"); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim() + + "," + "" + + "," + "" + + "," + txt_iCount_1.Text.Trim() + + "," + txt_psnQty_1.Text.Trim() + + "}"; + }; } - private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -213,7 +250,8 @@ { List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList); + gvList.Add(gvMx2); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } } /// <summary> @@ -227,8 +265,10 @@ 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); + gridViews.Add(gvMx2); + UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); } /// <summary> @@ -241,11 +281,11 @@ toolBarMenu1.isSetBtn = false; string djlx = txt_billType.Text.ToString(); string FNote = txt_returnReason.Text.ToString(); - string _sqGuid = txt_customerOrderNo.GetId(); + string _sqGuid = txt_salesOrderId.GetId(); if (string.IsNullOrEmpty(_sqGuid)) { Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒"); - txt_customerOrderNo.Focus(); + txt_salesOrderId.Focus(); return; } if (txt_billType.SelectedIndex < 0) @@ -274,7 +314,7 @@ var row = gvMx1.GetDataRow(i); if (row != null) { - Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString()); + Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString()); string _msl = row["sqQty"].ToString(); if (string.IsNullOrEmpty(_msl)) { @@ -316,7 +356,8 @@ toolBarMenu1.isSetBtn = true; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList); + gvList.Add(gvMx2); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); toolBarMenu1.currentAction = ""; } } @@ -355,16 +396,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(); + gcMain1.DataSource = dt; + gcMain1.ForceInitialize(); gridView1.BestFitColumns(); } else - UtilityHelper.SetDefaultTable(gcMain, gridView1); + UtilityHelper.SetDefaultTable(gcMain1, gridView1); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 pageBar1.CurrentPage = curPage;//褰撳墠椤� @@ -405,7 +446,8 @@ 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); + gvList.Add(gvMx2); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) @@ -423,6 +465,23 @@ else { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + JArray array2 = new JArray(); + foreach (var a in _job["rtnData"]["list2"]) + { + array2.Add(a); + } + DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString()); + if (dt2.Rows.Count > 0) + { + gcMx2.BindingContext = new BindingContext(); + gcMx2.DataSource = dt2; + gcMx2.ForceInitialize(); + gvMx2.BestFitColumns(); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); } } else @@ -514,11 +573,12 @@ { SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit; DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow(); - //gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString()); - gvMx1.SetFocusedRowCellValue("materialName", SelectedDataRow["itemName"].ToString()); - //gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString()); - //gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString()); + gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString()); + gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString()); + gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString()); + gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["itemId"].ToString()); //gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString()); + gvMx1.SetFocusedRowCellValue("salesQuantity", SelectedDataRow["fhSl"].ToString()); gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString()); gvMx1.CloseEditor(); gvMx1.UpdateCurrentRow(); @@ -563,5 +623,22 @@ } } } + + + private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) + { + if (e.FocusedRowHandle >= 0) + { + DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); + lbMxGuid.Text = row["guid"].ToString(); + ucBtnPrint1.guidKey = row["guid"].ToString(); + txtWlid.Text = row["itemId"].ToString(); + txtWlgg.Text = row["itemNo"].ToString(); + txtWlmc.Text = row["itemName"].ToString(); + txtQuantity.Text = row["sqQty"].ToString();//鐢宠鎬婚噺 + txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 + txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 + } + } } } \ No newline at end of file -- Gitblit v1.9.3