From d3089b86af2ef68f56ab0fcbd7faeda3b6228e0a Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 03 十二月 2025 13:08:38 +0800
Subject: [PATCH] 备单领料按钮优化
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 259 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 186 insertions(+), 73 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index a28e513..92fa746 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,8 +3,12 @@
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
+using DevExpress.XtraWaitForm;
+using Gs.DevApp.DevFrm;
+using Gs.DevApp.DevFrm.QC;
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;
@@ -56,8 +60,15 @@
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
- btnHb.ItemClick += BtnHb_ItemClick;
- btnChbg.ItemClick += BtnChbg_ItemClick;
+ btnAll.ItemClick += BtnAll_ItemClick;
+ btnGongZi.ItemClick += BtnGongZi_ItemClick;
+ btnLianBan.ItemClick += BtnLianBan_ItemClick;
+ btnGx.ItemClick += BtnGx_ItemClick;
+ btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
+ btnPingZhi.ItemClick += BtnPingZhi_ItemClick;
+ btnFPingZhi.ItemClick += BtnFPingZhi_ItemClick;
+ btnBDLingLiao.ItemClick += BtnBDLingLiao_ItemClick;
+
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -66,6 +77,7 @@
actions = lst;
}
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -75,7 +87,6 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
-
private bool _isCk(int _type)
{
Form parentForm = this.FindForm();
@@ -111,13 +122,11 @@
}
return false;
}
-
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
btnCaiGouFchkClick(this, e);
}
-
private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouChkClick != null)
@@ -146,7 +155,7 @@
if (btnShouHouChkClick != null)
btnShouHouChkClick(this, e);
}
-
+
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
bool bl = _isCk(0);
@@ -230,9 +239,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();
@@ -254,7 +264,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
frm.ShowDialog();
@@ -311,24 +321,23 @@
btnPrintClick(this, e);
else
return;
- //2025-09-01 kyy 娉ㄩ噴涓嶄娇鐢ㄨ繖涓叕鐢ㄦ柟娉�
- //if (rptParameter == "return false")
- // return;
- //if (string.IsNullOrEmpty(rptParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
- // return;
- //}
- //var _bl = false;
- //_bl = _ckRptService();
- //if (_bl)
- //{
- // var frm = new RptPreview(guidKey, rptParameter);
- // frm.ShowDialog();
- // return;
- //}
- //MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
+ if (rptParameter == "return false")
+ return;
+ if (string.IsNullOrEmpty(rptParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
+ return;
+ }
+ var _bl = false;
+ _bl = _ckRptService();
+ if (_bl)
+ {
+ var frm = new RptPreview(guidKey, rptParameter);
+ frm.ShowDialog();
+ return;
+ }
+ MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
}
private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
@@ -360,6 +369,55 @@
private void BtnQuery_ItemClick(object sender, ItemClickEventArgs e)
{
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);
+ }
+ private void BtnBaoGao_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBaoGaoClick != null)
+ btnBaoGaoClick(this, e);
+ }
+ private void BtnFPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnFPingZhiClick != null)
+ btnFPingZhiClick(this, e);
+ }
+
+ private void BtnBDLingLiao_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBDLingLiaoClick != null)
+ btnBDLingLiaoClick(this, e);
+ }
+
+ private void BtnPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPingZhiClick != null)
+ btnPingZhiClick(this, e);
+ }
+
+ private void BtnWj_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnWjClick != null) btnWjClick(this, e);
}
/// <summary>
@@ -399,14 +457,19 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
- lst.Add(btnHb.Name);
- lst.Add(btnChbg.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
+ // lst.Add(btnEsc.Name);
+ lst.Add(btnGx.Name);
+ lst.Add(btnBaoGao.Name);
+ lst.Add(btnBDLingLiao.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
}
}
-
/// <summary>
/// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
@@ -447,13 +510,18 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
- lst.Add(btnEdit.Name);
- lst.Add(btnHb.Name);
- lst.Add(btnChbg.Name);
+ lst.Add(btnIn.Name);
+ lst.Add(btnOut.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
+ // lst.Add(btnEsc.Name);
+ lst.Add(btnGx.Name);
+ lst.Add(btnBaoGao.Name);
+ lst.Add(btnBDLingLiao.Name);
_enabledBtn(lst);
}
-
-
}
}
@@ -476,8 +544,8 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
- lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -533,19 +601,6 @@
{
if (btnWgClick != null) btnWgClick(this, e);
}
-
- private void BtnHb_ItemClick(object sender, ItemClickEventArgs e)
- {
-
- bool bl = _isCk(1);
- if (bl) return;
- if (btnHbClick != null)
- {
- btnHbClick(this, e);
- }
- return;
- }
-
private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -610,13 +665,6 @@
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)
@@ -858,18 +906,6 @@
/// </summary>
public event EventHandler btnFChkClick;
-
- /// <summary>
- /// 妫�楠�
- /// </summary>
- public event EventHandler btnJianYanClick;
-
- /// <summary>
- /// 鍙嶆楠�
- /// </summary>
- public event EventHandler btnFjianYanClick;
-
-
/// <summary>
/// 鎵瑰噯
/// </summary>
@@ -994,14 +1030,50 @@
public event EventHandler btnOutClick;
/// <summary>
- /// 鍚堝苟
+ /// 鎵归噺璁剧疆
/// </summary>
- public event EventHandler btnHbClick;
+ public event EventHandler btnAllClick;
/// <summary>
- /// 鎾ゅ洖鎶ュ伐
+ /// 杩炵彮璁剧疆
/// </summary>
- public event EventHandler btnChbgClick;
+ public event EventHandler btnLianBanClick;
+
+
+ /// <summary>
+ /// 璁＄畻宸ヨ祫
+ /// </summary>
+ public event EventHandler btnGongZiClick;
+
+ /// <summary>
+ /// 宸ュ簭鍙樻洿
+ /// </summary>
+ public event EventHandler btnGxClick;
+
+ /// <summary>
+ /// 鐢熸垚鎶ュ憡
+ /// </summary>
+ public event EventHandler btnBaoGaoClick;
+
+ /// <summary>
+ /// 鍝佽川
+ /// </summary>
+ public event EventHandler btnPingZhiClick;
+
+ /// <summary>
+ /// 鍙嶅搧璐�
+ /// </summary>
+ public event EventHandler btnFPingZhiClick;
+
+ /// <summary>
+ /// 澶囧崟棰嗘枡
+ /// </summary>
+ public event EventHandler btnBDLingLiaoClick;
+
+ /// <summary>
+ /// 瀹岀粨
+ /// </summary>
+ public event EventHandler btnWjClick;
#endregion
@@ -1047,7 +1119,47 @@
public string defaultActions { get; set; }
#endregion
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="inType"></param>
+ public void SetAllButton(int inType)
+ {
+ var lstBtn = new List<string>();
+ if (inType == 0)
+ {
+ lstBtn.Add(btnSave.Name);
+ lstBtn.Add(btnEsc.Name);
+ foreach (BarItem item in barManager1.Items)
+ if (item is BarLargeButtonItem largeButtonItem)
+ {
+ if (!lstBtn.Contains(item.Name))
+ largeButtonItem.Enabled = true;
+ else
+ largeButtonItem.Enabled = false;
+ }
+ return;
+ }
+ if (inType == 2)
+ {
+ lstBtn.Add(btnHelp.Name);
+ lstBtn.Add(btnLoad.Name);
+ lstBtn.Add(btnQuery.Name);
+ lstBtn.Add(btnLayout.Name);
+ lstBtn.Add(btnFont.Name);
+ lstBtn.Add(btnAdd.Name);
+ foreach (BarItem item in barManager1.Items)
+ if (item is BarLargeButtonItem largeButtonItem)
+ {
+ if (lstBtn.Contains(item.Name))
+ largeButtonItem.Enabled = true;
+ else
+ largeButtonItem.Enabled = false;
+ }
+ return;
+ }
+ }
/// <summary>
/// 鏌ユ壘gridView
@@ -1135,6 +1247,7 @@
}
return spcList;
}
+
/// <summary>
/// 璇诲彇xml閰嶇疆锛岀洰鍓嶉厤缃甮cMain1,layoutMx1,鍔犳煡璇㈡潯浠�
/// </summary>
@@ -1145,7 +1258,6 @@
parentForm = this.Parent as Form;
else
parentForm = this.Parent.Parent as Form;
-
string _formNamespace = parentForm.GetType().FullName;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = getGvList();
List<DevExpress.XtraLayout.LayoutControl> layList = getLayList();
@@ -1256,5 +1368,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3