From fa43bc9d26c7b9ec2b07e2d3e1a7f07abe68da5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 15 五月 2025 14:46:59 +0800
Subject: [PATCH] 导入

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   97 +++++++++++++++---------------------------------
 1 files changed, 31 insertions(+), 66 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index ad85a95..5429567 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,6 +1,7 @@
 锘縰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;
@@ -16,7 +17,9 @@
 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
@@ -264,21 +267,6 @@
                 btnFjianYanClick(this, e);
             else
                 return;
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎾ゅ洖妫�楠屽悧锛�"))
-            //    return;
-            //_ckService(0.ToString());
         }
 
         private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
@@ -289,27 +277,6 @@
                 btnJianYanClick(this, e);
             else
                 return;
-
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�"))
-            //    return;
-            //var _obj = new
-            //{
-            //    guid = guidKey,
-            //    parameter = chkParameter
-            //};
-            //_ckService(1.ToString());
         }
         private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -326,38 +293,36 @@
                 MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎叆鏈嶅姟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
                 return;
             }
-
-            var openFileDialog = new OpenFileDialog();
-            //openFileDialog.InitialDirectory = "c:\\";
-            openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
-            openFileDialog.Title = "閫夋嫨鏂囦欢";
-            var result = openFileDialog.ShowDialog();
-            if (result == DialogResult.OK)
+            //鐢ㄤ簬鍒ゆ柇iqc,ipqc棣栨锛宨pqc宸℃锛宖qc
+            string strType = "";
+            if (xlsInService.Contains("&"))
             {
-                var WebApiUrl = ConfigurationManager.AppSettings["WebApiUrl"] +
-                                "Upload/UploadFile";
-                var strJson =
-                    await UtilityHelper.UploadFileAsync(openFileDialog
-                        .FileName);
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                string filePath = _rtn.rtnData["filePath"].ToString();
-                if (_rtn.rtnCode > 0)
-                {
-                    var _obj = filePath;
-                    try
-                    {
-                        strJson = UtilityHelper.HttpPost("",
-                            "XlsInOut/" + xlsInService,
-                            JsonConvert.SerializeObject(_obj));
-                        _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
-                    }
-                    catch (Exception ex)
-                    {
-                        MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                    }
-                }
+                strType = xlsInService.Split('&')[1];
             }
+            //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔$鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
+            string upGuid = Guid.NewGuid().ToString();
+            Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
+            frm.UpdateParent += (ss, ee) =>
+            {
+                var _obj = new
+                {
+                    tmpGuid = upGuid,
+                    strType = strType,
+                };
+                try
+                {
+                    string strJson = UtilityHelper.HttpPost("",
+                          "XlsInOut/" + xlsInService,
+                          JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            };
+            frm.ShowDialog();
         }
 
         private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)

--
Gitblit v1.9.3