bug

lu

2 天以前 9702c6a4dc358c7bff2eb18c8426229a0140e34a

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs

@@ -46,7 +46,11 @@
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            }, lbGuid);
            }, lbGuid, toolBarMenu1
            , () =>
            {
                ucRptCgdhd1.Initialize();
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //设置组织
@@ -147,7 +151,6 @@
            };
        }


        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -172,13 +175,17 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
         
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                gridView1.ActiveFilter.Clear();
                gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
                frm.UpdateParent += Frm_UpdateParent;
                frm.ShowDialog();
                return;
            }
            ucRptCgdhd1.ToolBarMenu1_btnQueryClick(sender, e);
        }

        /// <summary>
@@ -260,7 +267,7 @@
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                }
                else
                MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
@@ -275,19 +282,20 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim());
            else
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                //_filterList.Clear();
                //if (gridView1.ActiveFilter.Count > 0)
                //{
                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                //    gridView1.ActiveFilter.Clear();
                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                //}
                //getPageList(1);
                getPageList(this.pageBar1.CurrentPage);
                return;
            }
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(lbGuid.Text.Trim());
                return;
            }
            if (xtraTabControl1.SelectedTabPageIndex == 2)
            {
                ucRptCgdhd1.ToolBarMenu1_btnLoadClick(sender, e);
                return;
            }
        }

@@ -400,7 +408,7 @@
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        ItemId = int.Parse(row["itemId"].ToString()),
                        Quantity = decimal.Parse(row["quantity"].ToString()),
                        UrgentFlag = (row["urgentFlagTxt"].ToString().Replace(":","").Replace("普通", "").Replace("急料", "").Replace("一般", "")),
                        UrgentFlag = (row["urgentFlagTxt"].ToString().Replace(":", "").Replace("普通", "").Replace("急料", "").Replace("一般", "")),
                        Remark = row["memo"].ToString(),
                    });
                }