From 3f08b93ffba05c8a12d6a013303e372442854f5f Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 22 九月 2025 11:24:40 +0800
Subject: [PATCH] 增加推送报表
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index db352f3..455fbaa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -34,7 +34,11 @@
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
+ }, lbGuid, toolBarMenu1
+ , () =>
+ {
+ ucRptCgdhdPrint1.Initialize();
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//鎵撳嵃浜嬩欢
@@ -171,12 +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;
+ }
+ ucRptCgdhdPrint1.ToolBarMenu1_btnQueryClick(sender, e);
}
/// <summary>
/// 鏌ヨ鍥炶皟
@@ -196,20 +205,25 @@
/// <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)
+ {
+ ucRptCgdhdPrint1.ToolBarMenu1_btnLoadClick(sender, e);
+ return;
+ }
+
+
}
/// <summary>
///
--
Gitblit v1.9.3