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/UserControl/UcToolBarMenu.cs |  125 +++++++++++++++++++++++++++--------------
 1 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 5429567..c8cdce5 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,7 +1,6 @@
 锘縰sing DevExpress.XtraBars;
 using DevExpress.XtraEditors;
 using DevExpress.XtraGrid;
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraLayout;
 using Gs.DevApp.DevFrm.Rpt;
@@ -17,9 +16,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Gs.DevApp.UserControl
@@ -295,9 +292,15 @@
             }
             //鐢ㄤ簬鍒ゆ柇iqc,ipqc棣栨锛宨pqc宸℃锛宖qc
             string strType = "";
+            string strService = "";
             if (xlsInService.Contains("&"))
             {
                 strType = xlsInService.Split('&')[1];
+                strService = xlsInService.Split('&')[0];
+            }
+            else {
+                 strType = "";
+                 strService = xlsInService;
             }
             //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔$鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
             string upGuid = Guid.NewGuid().ToString();
@@ -312,7 +315,7 @@
                 try
                 {
                     string strJson = UtilityHelper.HttpPost("",
-                          "XlsInOut/" + xlsInService,
+                          "XlsInOut/" + strService,
                           JsonConvert.SerializeObject(_obj));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -327,45 +330,47 @@
 
         private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
         {
-            if (string.IsNullOrEmpty(this.xlsOutParameter))
-            {
-                ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-                return;
-            }
-            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
-            {
-                folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
-                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
-                if (dialogResult == DialogResult.OK)
-                {
-                    string _folder = folderBrowserDialog.SelectedPath;
-                    var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
-                    try
-                    {
-                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
-                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                        if (_rtn.rtnCode > 0)
-                        {
-                            string _file = _rtn.rtnData.fileUrl.ToString();
-                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
-                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
-                            using (WebClient client = new WebClient())
-                            {
-                                client.DownloadFile(_url, _folderName);
-                            }
-                            ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
-                        }
-                        else
-                        {
-                            ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                    }
-                }
-            }
+            if (btnOutClick != null) btnOutClick(this, e);
+
+            //if (string.IsNullOrEmpty(this.xlsOutParameter))
+            //{
+            //    ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+            //    return;
+            //}
+            //using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+            //{
+            //    folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+            //    DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+            //    if (dialogResult == DialogResult.OK)
+            //    {
+            //        string _folder = folderBrowserDialog.SelectedPath;
+            //        var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
+            //        try
+            //        {
+            //            string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
+            //            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+            //            if (_rtn.rtnCode > 0)
+            //            {
+            //                string _file = _rtn.rtnData.fileUrl.ToString();
+            //                string _folderName = _folder + "\\" + _file.Replace("down/", "");
+            //                string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+            //                using (WebClient client = new WebClient())
+            //                {
+            //                    client.DownloadFile(_url, _folderName);
+            //                }
+            //                ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+            //            }
+            //            else
+            //            {
+            //                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            //            }
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            //        }
+            //    }
+            //}
         }
 
         private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
@@ -429,6 +434,12 @@
         {
             if (btnOaClick != null) btnOaClick(this, e);
         }
+
+        /// <summary>
+        /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?"))
@@ -457,6 +468,12 @@
                 lst.Add(btnKg.Name);
                 lst.Add(btnWg.Name);
                 lst.Add(btnZhongTai.Name);
+                lst.Add(btnCaiWuChk.Name);
+                lst.Add(btnCaiWuFchk.Name);
+                lst.Add(btnCaiGouChk.Name);
+                lst.Add(btnCaiGouFchk.Name);
+                lst.Add(btnShouHouChk.Name);
+                lst.Add(btnShouHouFchk.Name);
                 _enabledBtn(lst);
                 this.currentAction = "esc";
                 if (btnEscClick != null) btnEscClick(this, e);
@@ -464,6 +481,11 @@
         }
 
 
+        /// <summary>
+        /// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnSaveClick != null)
@@ -474,7 +496,6 @@
                     var lst = new List<string>();
                     lst.Add(btnAdd.Name);
                     lst.Add(btnEdit.Name);
-                    //lst.Add(btnEsc.Name);
                     lst.Add(btnChk.Name);
                     lst.Add(btnFchk.Name);
                     lst.Add(btnDel.Name);
@@ -496,6 +517,13 @@
                     lst.Add(btnFont.Name);
                     lst.Add(btnLoad.Name);
                     lst.Add(btnTzbl.Name);
+                    lst.Add(btnZhongTai.Name);
+                    lst.Add(btnCaiWuChk.Name);
+                    lst.Add(btnCaiWuFchk.Name);
+                    lst.Add(btnCaiGouChk.Name);
+                    lst.Add(btnCaiGouFchk.Name);
+                    lst.Add(btnShouHouChk.Name);
+                    lst.Add(btnShouHouFchk.Name);
                     _enabledBtn(lst);
                 }
 
@@ -522,6 +550,9 @@
             lst.Add(btnHelp.Name);
             lst.Add(btnLayout.Name);
             lst.Add(btnFont.Name);
+            lst.Add(btnFont.Name);
+            lst.Add(btnJianYan.Name);
+            lst.Add(btnLog.Name);
             _enabledBtn(lst);
             this.currentAction = "edit";
             if (btnEdtClick != null) btnEdtClick(this, e);
@@ -1007,6 +1038,12 @@
         /// </summary>
         public event EventHandler btnOaClick;
 
+
+        /// <summary>
+        ///    瀵煎嚭
+        /// </summary>
+        public event EventHandler btnOutClick;
+
         #endregion
 
         #region 鍏叡灞炴��

--
Gitblit v1.9.3