From f064d6138dc73d8f54c66f0c6d3242d0376c71b4 Mon Sep 17 00:00:00 2001 From: cdk <2441919651@qq.com> Date: 星期五, 04 七月 2025 13:36:02 +0800 Subject: [PATCH] 增加倒冲欠料 --- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 49 +++++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index f8c63f9..9052651 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -11,11 +11,9 @@ 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 +38,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 +56,7 @@ btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick; btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick; btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick; + btnAll.ItemClick += BtnAll_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -65,6 +65,7 @@ actions = lst; } + /// <summary> /// 鍒濆鍖栨寜閽姸鎬� @@ -145,9 +146,6 @@ if (btnShouHouChkClick != null) btnShouHouChkClick(this, e); } - - - private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e) { @@ -186,7 +184,6 @@ return; } - private void BtnLog_ItemClick(object sender, ItemClickEventArgs e) { if (btnLogClick != null) btnLogClick(this, e); @@ -204,6 +201,10 @@ private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e) { 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) @@ -306,8 +307,8 @@ private void BtnReport_ItemClick(object sender, ItemClickEventArgs e) { - if (btnReportClick != null) - btnReportClick(this, e); + if (btnPrintClick != null) + btnPrintClick(this, e); else return; @@ -360,6 +361,12 @@ { if (btnQueryClick != null) btnQueryClick(this, e); } + + private void BtnAll_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnAllClick != null) + btnAllClick(this, e); + } /// <summary> /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬� @@ -384,6 +391,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); @@ -425,6 +433,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); @@ -632,7 +641,6 @@ JsonConvert.SerializeObject(_obj)); var dd = UtilityHelper.ReturnToList(strReturn); var dt = dd.rtnData; - if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("鏌ヨ")) { if (dt == null || dt.Rows.Count <= 0) @@ -831,22 +839,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> @@ -912,7 +913,7 @@ /// <summary> /// 鎶ヨ〃 /// </summary> - public event EventHandler btnReportClick; + public event EventHandler btnPrintClick; /// <summary> /// 缁撴 @@ -961,6 +962,10 @@ /// </summary> public event EventHandler btnOutClick; + /// <summary> + /// 鎵归噺璁剧疆 + /// </summary> + public event EventHandler btnAllClick; #endregion #region 鍏叡灞炴�� -- Gitblit v1.9.3