From c2248f08e9bdc75cac6a329bf37234c7af17f16c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 01 十一月 2024 15:20:47 +0800
Subject: [PATCH] 小细节
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 242 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 197 insertions(+), 45 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 3e13490..5b1867d 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,6 +3,7 @@
using System.Configuration;
using System.Data;
using System.Linq;
+using System.Net;
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
@@ -36,14 +37,19 @@
btnFchk.ItemClick += BtnFchk_ItemClick;
btnJianYan.ItemClick += BtnJianYan_ItemClick;
btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
+ btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
+ btnLog.ItemClick += BtnLog_ItemClick;
+ btnZhiLiangChk.ItemClick += BtnZhiLiangChk_ItemClick;
+ btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick;
+ btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
+ btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
- if (!string.IsNullOrEmpty(item.Caption))
+ if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊")
lst.Add(item.Caption);
actions = lst;
}
-
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -52,6 +58,90 @@
{
base.OnCreateControl();
if (Parent != null) getNamespace();
+ }
+
+ private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnCaiGouFchkClick != null)
+ btnCaiGouFchkClick(this, e);
+ if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+
+ if (string.IsNullOrEmpty(chkParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ return;
+ }
+
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘鍙嶅鏍稿悧锛�"))
+ return;
+ _ckService("-2");
+ }
+
+ private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnCaiGouChkClick != null)
+ btnCaiGouChkClick(this, e);
+ if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+
+ if (string.IsNullOrEmpty(chkParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ return;
+ }
+
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵"))
+ return;
+ _ckService("2");
+ }
+
+ private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnZhiLiangFchkClick != null)
+ btnZhiLiangFchkClick(this, e);
+ if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+
+ if (string.IsNullOrEmpty(chkParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ return;
+ }
+
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺鍙嶅鏍稿悧锛�"))
+ return;
+ _ckService("-3");
+ }
+
+ private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnZhiLiangChkClick != null)
+ btnZhiLiangChkClick(this, e);
+ if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+
+ if (string.IsNullOrEmpty(chkParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ return;
+ }
+
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
+ return;
+ _ckService("3");
}
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
@@ -102,13 +192,32 @@
_ckService(1.ToString());
}
+
+ private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnLogClick != null) btnLogClick(this, e);
+ else
+ return;
+ if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ UserControl.ShowLogcs frm = new ShowLogcs();
+ frm.ShowDialog();
+ }
+
+ private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPiZhunClick != null) btnPiZhunClick(this, e);
+ }
+
private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnFjianYanClick != null)
btnFjianYanClick(this, e);
else
return;
-
if (string.IsNullOrEmpty(guidKey))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -198,45 +307,45 @@
private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
{
- //if (string.IsNullOrEmpty(this.xlsOutView))
- //{
- // 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.xlsOutView);
- // 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 (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)
@@ -302,6 +411,12 @@
lst.Add(btnDesign.Name);
lst.Add(btnChk.Name);
lst.Add(btnFchk.Name);
+ lst.Add(btnJianYan.Name);
+ lst.Add(btnFjianYan.Name);
+ lst.Add(btnOut.Name);
+ lst.Add(btnIn.Name);
+ lst.Add(btnLog.Name);
+ lst.Add(btnPiZhun.Name);
_enabledBtn(lst);
if (btnEscClick != null) btnEscClick(this, e);
}
@@ -498,7 +613,7 @@
}
//榛樿鍚敤鐨勬寜閽�
- // _enabledList.Add(btnDesign.Name);
+ _enabledList.Add(btnLoad.Name);
_enabledBtn(_enabledList);
}
catch (Exception ex)
@@ -630,6 +745,41 @@
/// </summary>
public event EventHandler btnFjianYanClick;
+
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ public event EventHandler btnPiZhunClick;
+
+
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ public event EventHandler btnLogClick;
+
+
+ /// <summary>
+ /// 閲囪喘瀹℃牳
+ /// </summary>
+ public event EventHandler btnCaiGouChkClick;
+
+ /// <summary>
+ /// 閲囪喘鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnCaiGouFchkClick;
+
+ /// <summary>
+ /// 璐ㄩ噺瀹℃牳
+ /// </summary>
+ public event EventHandler btnZhiLiangChkClick;
+
+
+ /// <summary>
+ /// 璐ㄩ噺鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnZhiLiangFchkClick;
+
+
#endregion
#region 鍏叡灞炴��
@@ -652,7 +802,7 @@
public string rptParameter { get; set; }
/// <summary>
- /// 瀵煎嚭锛岃鍥惧悕,濡傦細瑙嗗浘鍚峽鍏ュ弬1鍚峾鍏ュ弬鍊�,鍏ュ弬2鍚峾鍏ュ弬鍊紏
+ /// 瀵煎嚭锛岃鍥惧悕,濡傦細瀛樺偍杩囩▼鍚峽鍏ュ弬1鍚峾鍏ュ弬鍊�,鍏ュ弬2鍚峾鍏ュ弬鍊紏
/// </summary>
public string xlsOutParameter { get; set; }
@@ -662,10 +812,12 @@
public string xlsInService { get; set; }
/// <summary>
- /// 瀹℃牳鍙傛暟,琛ㄥ悕,瀛楁鍚嶏紝濡傦細MES_HOLIDAY,check_date,check_status,check_by
+ /// 瀹℃牳鍙傛暟,琛ㄥ悕,瀛楁鍚嶏紝濡傦細MES_HOLIDAY,check_date,check_status,check_by,瀛樺偍杩囩▼鍚�
/// </summary>
public string chkParameter { get; set; }
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3