From cf7744e9f271b675181f622f3e16b2fa5e85e7a1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 09 八月 2025 17:42:27 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 136 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 109 insertions(+), 27 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 93a9be6..4488ac2 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -5,17 +5,16 @@
using DevExpress.XtraLayout;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
+using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
using System.IO;
using System.Linq;
-using System.Net;
using System.Text;
using System.Windows.Forms;
@@ -40,6 +39,7 @@
btnChk.ItemClick += BtnChk_ItemClick;
btnFchk.ItemClick += BtnFchk_ItemClick;
btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
+ btnFPiZhun.ItemClick += BtnFPiZhun_ItemClick;
btnLog.ItemClick += BtnLog_ItemClick;
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
@@ -57,6 +57,11 @@
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
+ btnAll.ItemClick += BtnAll_ItemClick;
+ btnGongZi.ItemClick += BtnGongZi_ItemClick;
+ btnLianBan.ItemClick += BtnLianBan_ItemClick;
+ btnGx.ItemClick += BtnGx_ItemClick;
+ btnWeight.ItemClick += BtnWeight_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -64,7 +69,30 @@
lst.Add(item.Caption);
actions = lst;
}
-
+ /// <summary>
+ /// 鍚姩绉伴噸
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void BtnWeight_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ bool isOpen = false;
+ foreach (Form form in Application.OpenForms)
+ {
+ if (form is Frm_Work09)
+ {
+ isOpen = true;
+ form.Activate(); // 婵�娲诲凡瀛樺湪鐨勭獥浣�
+ break;
+ }
+ }
+ if (!isOpen)
+ {
+ var form = new Frm_Work09(QcSeason.iqc绉伴噸.ToString());
+ form.Show();
+ }
+ }
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -110,7 +138,7 @@
}
return false;
}
-
+
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
@@ -145,7 +173,7 @@
if (btnShouHouChkClick != null)
btnShouHouChkClick(this, e);
}
-
+
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
bool bl = _isCk(0);
@@ -201,6 +229,10 @@
{
if (btnPiZhunClick != null) btnPiZhunClick(this, e);
}
+ private void BtnFPiZhun_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnFPiZhunClick != null) btnFPiZhunClick(this, e);
+ }
private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -225,9 +257,10 @@
strType = xlsInService.Split('&')[1];
strService = xlsInService.Split('&')[0];
}
- else {
- strType = "";
- strService = xlsInService;
+ else
+ {
+ strType = "";
+ strService = xlsInService;
}
//杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
string upGuid = Guid.NewGuid().ToString();
@@ -249,7 +282,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
frm.ShowDialog();
@@ -302,8 +335,8 @@
private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnReportClick != null)
- btnReportClick(this, e);
+ if (btnPrintClick != null)
+ btnPrintClick(this, e);
else
return;
@@ -357,6 +390,29 @@
if (btnQueryClick != null) btnQueryClick(this, e);
}
+ private void BtnAll_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnAllClick != null)
+ btnAllClick(this, e);
+ }
+
+ private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnLianBanClick != null)
+ btnLianBanClick(this, e);
+ }
+
+ private void BtnGongZi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnGongZiClick != null)
+ btnGongZiClick(this, e);
+ }
+ private void BtnGx_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnGxClick != null)
+ btnGxClick(this, e);
+ }
+
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -380,6 +436,7 @@
lst.Add(btnIn.Name);
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
@@ -393,6 +450,10 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
+ // lst.Add(btnEsc.Name);
+ lst.Add(btnGx.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -421,6 +482,7 @@
lst.Add(btnQuery.Name);
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnDesign.Name);
lst.Add(btnReport.Name);
lst.Add(btnKg.Name);
@@ -438,10 +500,15 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
+ lst.Add(btnIn.Name);
+ lst.Add(btnOut.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
+ // lst.Add(btnEsc.Name);
+ lst.Add(btnGx.Name);
+ lst.Add(btnWeight.Name);
_enabledBtn(lst);
}
-
-
}
}
@@ -464,8 +531,8 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
- lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
+ lst.Add(btnWeight.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -493,6 +560,7 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
+ lst.Add(btnWeight.Name);
_enabledBtn(lst);
this.currentAction = "add";
if (btnAddClick != null) btnAddClick(this, e);
@@ -826,22 +894,15 @@
/// </summary>
public event EventHandler btnFChkClick;
-
- /// <summary>
- /// 妫�楠�
- /// </summary>
- public event EventHandler btnJianYanClick;
-
- /// <summary>
- /// 鍙嶆楠�
- /// </summary>
- public event EventHandler btnFjianYanClick;
-
-
/// <summary>
/// 鎵瑰噯
/// </summary>
public event EventHandler btnPiZhunClick;
+
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ public event EventHandler btnFPiZhunClick;
/// <summary>
@@ -907,7 +968,7 @@
/// <summary>
/// 鎶ヨ〃
/// </summary>
- public event EventHandler btnReportClick;
+ public event EventHandler btnPrintClick;
/// <summary>
/// 缁撴
@@ -956,6 +1017,27 @@
/// </summary>
public event EventHandler btnOutClick;
+ /// <summary>
+ /// 鎵归噺璁剧疆
+ /// </summary>
+ public event EventHandler btnAllClick;
+
+ /// <summary>
+ /// 杩炵彮璁剧疆
+ /// </summary>
+ public event EventHandler btnLianBanClick;
+
+
+ /// <summary>
+ /// 璁＄畻宸ヨ祫
+ /// </summary>
+ public event EventHandler btnGongZiClick;
+
+ /// <summary>
+ /// 宸ュ簭鍙樻洿
+ /// </summary>
+ public event EventHandler btnGxClick;
+
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3