From a89f2c46d1f53a4d9e23dc76b949b40d2b2b18a6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 08 二月 2025 08:22:22 +0800
Subject: [PATCH] 采购退货

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs |   79 +++++++++++++++++++++------------------
 1 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
index bda48d8..ec4578e 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
-using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using DevExpress.XtraEditors;
 using Gs.DevApp.Entity;
@@ -16,28 +16,20 @@
     {
         private List<FilterEntity> _filterList = new List<FilterEntity>();
         private readonly string _webServiceName = "MesPositionManager/";
-
         public Frm_MesPosition()
         {
             InitializeComponent();
             toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            getPageList(1, UtilityHelper.GetPageSize());
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+            getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            gridView1.CustomDrawRowIndicator += (s, e) =>
-            {
-                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
-            };
-            gridView1.CustomDrawEmptyForeground += (s, e) =>
-            {
-                var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                var f = new Font("寰蒋闆呴粦", 16);
-                var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
-                    e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
-                e.Graphics.DrawString(str, f, Brushes.Gray, r);
-            };
+        }
+        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+           Task.Delay(100);
+            getPageList(1);
         }
 
         /// <summary>
@@ -60,7 +52,7 @@
         /// <param name="pageSize"></param>
         private void PageBar1_PagerEvent(int curPage, int pageSize)
         {
-            getPageList(curPage, pageSize);
+            getPageList(curPage);
         }
 
         /// <summary>
@@ -70,6 +62,9 @@
         /// <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);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
@@ -83,7 +78,7 @@
         private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
         {
             _filterList = e.FilterList;
-            getPageList(1, pageBar1.RowsCount);
+            getPageList(1);
         }
 
         /// <summary>
@@ -93,23 +88,31 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim(), false, 999);
-            else
-                getPageList(1, UtilityHelper.GetPageSize());
+            //if (xtraTabControl1.SelectedTabPageIndex == 1)
+            //    getModel(lbGuid.Text.Trim());
+            //else
+            //{
+            //    //_filterList.Clear();
+            //    //if (gridView1.ActiveFilter.Count > 0)
+            //    //{
+            //    //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            //    //    gridView1.ActiveFilter.Clear();
+            //    //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            //    //}
+            //    //getPageList(1);
+            //    getPageList(this.pageBar1.CurrentPage);
+            //}
         }
 
         /// <summary>
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage, int pageSize)
+        private   void getPageList(int curPage)
         {
-            var _sbSqlWhere = new StringBuilder();
-            foreach (var itm in _filterList)
-                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
-                                   itm.fileValue + "'");
-            var pgq = new PageQueryModel(curPage, pageSize, "position_name",
+            
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "position_name",
                 "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -121,14 +124,18 @@
                 {
                     DataTable dt = dd.rtnData.list;
                     gcMain.BindingContext = new BindingContext();
-                    gcMain.DataSource = dt;
-                    gcMain.ForceInitialize();
-                    int dddd = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.TotalPages = dddd;
-                    pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain.DataSource = dt;
+                        gcMain.ForceInitialize();
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
                     pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
-                    pageBar1.setTxt();
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
                 }
                 else
                 {

--
Gitblit v1.9.3