From 0cedb538f7bfefa75a80134fffb8d65cf5074e98 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 十二月 2025 11:18:40 +0800
Subject: [PATCH] 其他出入库代码搬祈禧的

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
index aca9861..85104a3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
 using Newtonsoft.Json;
@@ -27,16 +28,20 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
-           {
-               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-           }, tips);
+            {
+                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);
+            }, lbGuid, toolBarMenu1
+            , () =>
+            {
+                ucRptQtrkdj1.Initialize();
+            });
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
         }
@@ -76,12 +81,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;
+            }
+            ucRptQtrkdj1.ToolBarMenu1_btnQueryClick(sender, e);
         }
         /// <summary>
         /// 鏌ヨ鍥炶皟
@@ -272,7 +282,8 @@
                 case 0:
                     strMsg = "鍙嶅鏍�";
                     break;
-            };
+            }
+            ;
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");

--
Gitblit v1.9.3