From f14d1fc28a8012035ee251fba71a0d048e9efd0d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 16 一月 2025 09:10:48 +0800
Subject: [PATCH] 工具条切换状态
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 90 +++++++++++++++++++++++++++++++--------------
1 files changed, 62 insertions(+), 28 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 8cd1442..18c9a08 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -1,5 +1,4 @@
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -31,6 +30,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qt015", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -44,10 +44,10 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- txt_qt011.getSuppler("");
+ txt_qt008.getSuppler("");
txt_qt018.getSuppler("");
//璁剧疆浠撳簱閫夋嫨
- this.txt_qt011.EditChanged += (s, e) =>
+ this.txt_qt008.EditChanged += (s, e) =>
{
};
@@ -117,7 +117,7 @@
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -196,9 +196,10 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 0)
- getPageList(this.pageBar1.CurrentPage);
+ { }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -220,14 +221,15 @@
getModel(lbGuid.Text.Trim());
else
{
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
/// <summary>
@@ -246,7 +248,17 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ }
}
/// <summary>
/// 鏂板浜嬩欢
@@ -271,7 +283,7 @@
{
toolBarMenu1.isSetBtn = false;
string inGys = txt_qt018.GetId();
- string inCjId = txt_qt011.GetId();
+ string inCjId = txt_qt008.GetId();
if (string.IsNullOrEmpty(inGys))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
@@ -281,21 +293,23 @@
if (string.IsNullOrEmpty(inCjId))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- txt_qt011.Focus();
+ txt_qt008.Focus();
return;
}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- inRklb = txt_qt003.Text.Trim(),//澶囨敞
- inYwlx = txt_qt004.Text.Trim(),//涓氬姟绫诲瀷
- inRkfs = txt_qt019.Text.Trim(),//鍏ュ簱鏂瑰紡
- inRklx = txt_qt020.Text.Trim(),//鍏ュ簱绫诲瀷
- inGys = inGys,//渚涘簲鍟�
- inCjId = inCjId,//鍏ュ簱浠撳簱
- inDepart = txt_qt009.GetId(),//鐢宠閮ㄩ棬
- inXsdh = txt_qt021.Text.Trim(),//閿�鍞崟鍙�
+ kcZz = txt_qt022.GetId(),//搴撳瓨缁勭粐
+ kcBm = txt_qt009.GetId(),//搴撳瓨閮ㄩ棬
+ kcGys = txt_qt018.GetId(),//搴撳瓨渚涘簲鍟�
+ kcCk = txt_qt008.GetId(),//搴撳瓨渚涘簲鍟�
inRkyy = txt_qt010.Text.Trim(),//鍏ュ簱鍘熷洜
+ djLx = txt_qt003.Text.Trim(),//鍗曟嵁绫诲瀷
+ kcfx = txt_qt019.Text.Trim(),//搴撳瓨鏂瑰悜
+ hzlx = txt_qt023.Text.Trim(),//璐т富绫诲瀷
+ hzzz = txt_qt024.GetId(),//璐т富缁勭粐
+ hzkh = txt_qt025.GetId(),//璐т富瀹㈡埛
+ hzbm = txt_qt026.GetId(),//璐т富閮ㄩ棬
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -368,6 +382,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -424,10 +439,29 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+
+ JArray array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ array2.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
}
else
@@ -572,12 +606,12 @@
DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
lbMxGuid.Text = row["guid"].ToString();
ucBtnPrint1.guidKey = row["guid"].ToString();
- txtWlid.Text = row["itemId"].ToString();
+ txtWlid.Text = row["qd002"].ToString();
txtWlgg.Text = row["qd004"].ToString();
txtWlmc.Text = row["qd003"].ToString();
- txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
- txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
- kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
+ //txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
+ //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
+ //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
}
}
/// <summary>
--
Gitblit v1.9.3