From ccc1b0d541d8f3bdd2bcb72dd0b5533e68b886d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 09 六月 2025 09:53:37 +0800
Subject: [PATCH] 采购明细报表

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs |  168 ++++++++++++++++++-------------------------------------
 1 files changed, 56 insertions(+), 112 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 11d9860..5eb5e7b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
 using DevExpress.XtraGrid.Views.Grid;
@@ -12,6 +7,11 @@
 using MES.Service.Modes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm
 {
@@ -28,26 +28,25 @@
             toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            //toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
-            //toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            });
+           {
+               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);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
         }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
         }
@@ -71,7 +70,7 @@
             gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
             gridView1.ActiveFilter.Clear();
             gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList);
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -85,27 +84,6 @@
         {
             _filterList = e.FilterList;
             getPageList(1);
-        }
-
-        /// <summary>
-        ///     鍙嶅鏍�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
-        {
-            _toolCk(0);
-        }
-
-        /// <summary>
-        ///     瀹℃牳浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
-        {
-            _toolCk(1);
         }
 
         /// <summary>
@@ -166,10 +144,9 @@
             {
                 List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                 gvList.Add(gvMx1);
-                UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
         }
-
 
 
         /// <summary>
@@ -200,20 +177,29 @@
             {
                 var row = gvMx1.GetDataRow(i);
                 if (row != null)
+                {
+                    if (string.IsNullOrEmpty(row["depotSectionCode"].ToString()))
+                    {
+                        MsgHelper.ShowError("缂栫爜涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["DepotSectionName"].ToString()))
+                    {
+                        MsgHelper.ShowError("鍚嶇О涓嶈兘涓虹┖锛�");
+                        return;
+                    }
                     lst.Add(new MesDepotSections
                     {
                         Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                         DepotSectionCode = row["depotSectionCode"].ToString(),
                         DepotSectionName = row["DepotSectionName"].ToString(),
                         Description = row["Description"].ToString(),
-                      //KbQty = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["KbQty"].ToString()),
-                      //  DepotSectionNamet = row["depotSectionNamet"].ToString(),
-                       // CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBoole(row["completenessFlag"].ToString()),
                     });
+                }
             }
             var _obj = new MesDepots
             {
-                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+                Guid = lbGuid.Text.Trim(),
                 DepotCode = txt_depotCode.Text,
                 DepotName = txt_depotName.Text,
                 Description = txt_description.Text,
@@ -233,7 +219,9 @@
                     toolBarMenu1.isSetBtn = true;
                     var gridViews = new List<GridView>();
                     gridViews.Add(gvMx1);
-                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false, gridViews);
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
             }
             catch (Exception ex)
@@ -248,8 +236,8 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.depot_code", "asc",
+            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
                 "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -257,14 +245,28 @@
                 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; //褰撳墠椤�
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns();
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, 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)
             {
@@ -298,19 +300,17 @@
                     lbGuid.Text = strGuid;
                     var gvList = new List<GridView>();
                     gvList.Add(gvMx1);
-                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit,
-                        gvList);
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                     var _job = JObject.Parse(strJson);
                     var array = new JArray();
                     foreach (var a in _job["rtnData"]["list"]) array.Add(a);
-                    var dt =
-                        JsonConvert.DeserializeObject<DataTable>(
-                            array.ToString());
+                    var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                     if (dt.Rows.Count > 0)
                     {
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
                     }
                     else
                     {
@@ -365,61 +365,5 @@
                 }
             }
         }
-
-
-        /// <summary>
-        /// 宸ュ叿鏉′簨浠�
-        /// </summary>
-        /// <param name="inFieldValue"></param>
-        private void _toolCk(int _inFieldValue)
-        {
-            string strMsg = "";
-            switch (_inFieldValue)
-            {
-                case 1:
-                    strMsg = "瀹℃牳";
-                    break;
-                case 0:
-                    strMsg = "鍙嶅鏍�";
-                    break;
-            };
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_depotName, gridView1, "depotName");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
-                return;
-
-            var _obj = new
-            {
-                guid = rowGuid,
-                ckValue = _inFieldValue,
-                parameter = "MES_DEPOTS,check_date,check_status,check_by"
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
-                if (_rtn.rtnCode > 0)
-                {
-                    if (xtraTabControl1.SelectedTabPageIndex == 1)
-                        getModel(lbGuid.Text.Trim());
-                    else
-                        getPageList(this.pageBar1.CurrentPage);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-
-        }
-
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3