From f8ccd06cca50bed1e226bb81634057908958ab57 Mon Sep 17 00:00:00 2001 From: cnf <3200815559@qq.com> Date: 星期六, 23 八月 2025 16:15:49 +0800 Subject: [PATCH] 1增加了通用控件选择库位 2增加撤回报工,自动入库维护功能 --- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 0f068f9..e54eaf1 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -57,6 +57,7 @@ btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick; btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick; btnHb.ItemClick += BtnHb_ItemClick; + btnChbg.ItemClick += BtnChbg_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -399,6 +400,7 @@ lst.Add(btnShouHouChk.Name); lst.Add(btnShouHouFchk.Name); lst.Add(btnHb.Name); + lst.Add(btnChbg.Name); _enabledBtn(lst); this.currentAction = "esc"; if (btnEscClick != null) btnEscClick(this, e); @@ -447,6 +449,7 @@ lst.Add(btnShouHouFchk.Name); lst.Add(btnEdit.Name); lst.Add(btnHb.Name); + lst.Add(btnChbg.Name); _enabledBtn(lst); } @@ -533,7 +536,14 @@ private void BtnHb_ItemClick(object sender, ItemClickEventArgs e) { - if (btnHbClick != null) btnHbClick(this, e); + + bool bl = _isCk(1); + if (bl) return; + if (btnHbClick != null) + { + btnHbClick(this, e); + } + return; } @@ -600,6 +610,13 @@ Gs.DevApp.UserControl.SelectFont DevFrm = new SelectFont(); DevFrm.ShowDialog(); } + + private void BtnChbg_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnChbgClick != null) btnChbgClick(this, e); + } + + private void _enabledBtn(List<string> lstBtn) { foreach (BarItem item in barManager1.Items) @@ -981,6 +998,11 @@ /// </summary> public event EventHandler btnHbClick; + /// <summary> + /// 鎾ゅ洖鎶ュ伐 + /// </summary> + public event EventHandler btnChbgClick; + #endregion #region 鍏叡灞炴�� @@ -1113,7 +1135,6 @@ } return spcList; } - /// <summary> /// 璇诲彇xml閰嶇疆锛岀洰鍓嶉厤缃甮cMain1,layoutMx1,鍔犳煡璇㈡潯浠� /// </summary> -- Gitblit v1.9.3