From 9ce8cb1ee053fb5ad4b51d724a5736e0e27ff0aa Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 23 五月 2025 09:10:52 +0800 Subject: [PATCH] 仓库 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs index bc0d8ea..8d6cd74 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs @@ -34,14 +34,14 @@ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (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; //璁剧疆閿�鍞崟 @@ -54,6 +54,9 @@ txt_fSalesManIDTxt.Text = txt_salesId.GetSalesUserName(); txt_fCustomerIDTxt.Text = txt_salesId.GetSalesCusName(); txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName(); + txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName(); + txt_shf.Text = txt_salesId.GetSalesShf(); + txt_shName.Text = txt_salesId.GetSalesShfName(); 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); @@ -64,27 +67,17 @@ var rtn = UtilityHelper.ReturnToTablePage(strReturn); var dt = rtn.rtnData.list; this.repositoryItemSearchLookUpEdit1.DataSource = dt; + repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; } catch (Exception ex) { MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } }; - - //gridView1.FocusedRowChanged += (s, e) => - //{ - - // if (gridView1.GetSelectedRows() != null) - // { - // var selectedRow = gridView1.GetSelectedRows()[0]; // 鑾峰彇绗竴涓�変腑琛岀殑绱㈠紩 - // var checkStatus = gridView1.GetRowCellValue(selectedRow, "guid").ToString(); // 鑾峰彇鎸囧畾鍒楃殑鍊� - // getModel(checkStatus); - // } - //}; } 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); } @@ -107,7 +100,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 +210,7 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { - getModel(lbGuid.Text.Trim()); + getModel(rowGuid); } else { @@ -273,6 +266,7 @@ list = new List<dynamic>(), }; gvMx1.CloseEditor(); + gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); if (gvMx1.DataRowCount <= 0) { @@ -289,6 +283,11 @@ if (string.IsNullOrEmpty(_msl)) { MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�"); + return; + } + if (string.IsNullOrEmpty(row["YjfhDate"].ToString())) + { + MsgHelper.ShowError("棰勮鍙戣揣鏃堕棿涓嶈兘涓虹┖锛�"); return; } _obj.list.Add(new @@ -315,6 +314,7 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); toolBarMenu1.currentAction = ""; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } } catch (Exception ex) @@ -342,7 +342,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 @@ -358,7 +358,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); @@ -416,6 +416,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -532,6 +533,7 @@ gvMx1.SetFocusedRowCellValue("gyOrg", SelectedDataRow["gyOrg"].ToString()); gvMx1.SetFocusedRowCellValue("kcOrg", SelectedDataRow["kcOrg"].ToString()); gvMx1.CloseEditor(); + gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); } @@ -575,7 +577,5 @@ } } } - - } } \ No newline at end of file -- Gitblit v1.9.3