From 8d44a6ea0ab8850f0d95ea97880fc08d7851c5f7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 14 十二月 2024 21:49:02 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs |   97 +++++++++++++++++++++++++++++-------------------
 1 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index aaab8e5..01a4d11 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -1,5 +1,6 @@
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
@@ -7,6 +8,7 @@
 using System.Data;
 using System.Drawing;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm
@@ -23,35 +25,30 @@
             toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
             toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
             gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            getPageList(1, UtilityHelper.GetPageSize());
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
+            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) =>
-            {
-                string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                Font f = new Font("寰蒋闆呴粦", 16);
-                Rectangle 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);
-            };
+            txt_depotsId.getSuppler("");
+            txt_suppId.getSuppler("");
             //璁剧疆浠撳簱閫夋嫨
-            this.txt_depotsId.KeyFile = "depotId";
             this.txt_depotsId.EditChanged += (s, e) =>
             {
                 txtDepotsId.Text = this.txt_depotsId.GetId();
             };
             //璁剧疆渚涘簲鍟嗛�夋嫨
-            this.txt_suppId.KeyFile = "id";
             this.txt_suppId.EditChanged += (s, e) =>
             {
                 txtSupplierId.Text = this.txt_suppId.GetId();
             };
             gcMx1.MouseClick += GcMx1_MouseClick;
+        }
+        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+            Task.Delay(100);
+            getPageList(1);
         }
         private void GcMx1_MouseClick(object sender, MouseEventArgs e)
         {
@@ -87,7 +84,7 @@
         /// <param name="pageSize"></param>
         private void PageBar1_PagerEvent(int curPage, int pageSize)
         {
-            getPageList(curPage, pageSize);
+            getPageList(curPage);
         }
         /// <summary>
         /// 鏌ヨ浜嬩欢
@@ -96,7 +93,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
         {
-            Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -108,7 +108,7 @@
         private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
         {
             _filterList = e.FilterList;
-            getPageList(1, pageBar1.RowsCount);
+            getPageList(1);
         }
         private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
         {
@@ -152,6 +152,7 @@
                 this.toolBarMenu1.rptParameter = "return false";
                 return;
             }
+            toolBarMenu1.guidKey = lbMxGuid.Text;
             this.toolBarMenu1.rptParameter = "rpt_Arrival{" + ""
                    + "," + ""
                    + "," + ""
@@ -167,21 +168,29 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+            {
+                _filterList.Clear();
+                if (gridView1.ActiveFilter.Count > 0)
+                {
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    gridView1.ActiveFilter.Clear();
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                }
+                getPageList(1);
+            }
         }
         /// <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, "create_date",
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
                 "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -189,16 +198,27 @@
                 var strReturn = UtilityHelper.HttpPost("",
                     _webServiceName + "GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = dd.rtnData.list;
-                gcMain.BindingContext = new BindingContext();
-                gcMain.DataSource = dt;
-                gcMain.ForceInitialize();
-                var dddd = dd.rtnData.pages; //鎬婚〉
-                pageBar1.TotalPages = dddd;
-                pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
-                pageBar1.CurrentPage = curPage; //褰撳墠椤�
-                pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
-                pageBar1.setTxt();
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    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.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
             }
             catch (Exception ex)
             {
@@ -248,7 +268,6 @@
                     //{
                     //    list3.Add(a);
                     //}
-
                     //DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(list3.ToString());
                     //if (dt1.Rows.Count > 0)
                     //{

--
Gitblit v1.9.3