From ad76617fb57542f92350f84a33b0c2cf63f69383 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 11 四月 2025 15:14:24 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 104 +++++++++++++++++++++++++++------------------------
1 files changed, 55 insertions(+), 49 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 2f04a9b..e2b6400 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -19,7 +19,7 @@
{
InitializeComponent();
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ // this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -47,7 +47,7 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
+
//杩欐槸鎶ュ伐鐮�
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
@@ -58,7 +58,8 @@
_print();
};
//杩欐槸杩芥函鐮�
- this.ucBtnPrint98.btnDesignClick += (s, e) => {
+ this.ucBtnPrint98.btnDesignClick += (s, e) =>
+ {
ucBtnPrint98.rptParameter = "rpt_trace{}";
};
this.ucBtnPrint98.btnReportClick += (s, e) =>
@@ -67,15 +68,15 @@
};
}
-
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -95,7 +96,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -117,7 +118,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
{
-
+
}
/// <summary>
/// 鍙嶇粨妗�
@@ -241,36 +242,36 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
- toolBarMenu1.isSetBtn = false;
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- sjxt = txt_sjXt.GetId(), //瀹為檯绾夸綋
- bz = txt_daa009.Text.Trim()//澶囨敞
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
- toolBarMenu1.currentAction = "";
- txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
- txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
- toolBarMenu1.currentAction = "";
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ //toolBarMenu1.isSetBtn = false;
+ //var _obj = new
+ //{
+ // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ // sjxt = txt_sjXt.GetId(), //瀹為檯绾夸綋
+ // bz = txt_daa009.Text.Trim()//澶囨敞
+ //};
+ //try
+ //{
+ // string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ // if (_rtn.rtnCode > 0)
+ // {
+ // lbGuid.Text = _rtn.rtnData;
+ // toolBarMenu1.isSetBtn = true;
+ // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ // gvList.Add(gvMx1);
+ // UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ // toolBarMenu1.currentAction = "";
+ // txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
+ // txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
+ // toolBarMenu1.currentAction = "";
+ // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ //}
}
/// <summary>
@@ -341,14 +342,16 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- string cjId = dy.daa013;
- string xjxt = dy.sjXt;
- txt_sjXt.getSuppler(cjId, xjxt);
+ //string cjId = dy.daa013;
+ //string xjxt = dy.sjXt;
+ // txt_sjXt.getSuppler(cjId, xjxt);
+ txt_yQty.Text = dy.yQty;
+ txt_kQty.Text = dy.kQty;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -380,12 +383,12 @@
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
-
JArray array3 = new JArray();
foreach (var a in _job["rtnData"]["list3"])
{
@@ -398,6 +401,7 @@
gcMx3.DataSource = dt3;
gcMx3.ForceInitialize();
gvMx3.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx3);
}
else
{
@@ -482,7 +486,8 @@
{
getModel(lbGuid.Text.Trim());
}
- else {
+ else
+ {
//娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
getPageList(this.pageBar1.CurrentPage);
int rowHandle = gridView1.LocateByValue("guid", rowGuid);
@@ -516,13 +521,14 @@
}
if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍐呭寘瑁呮暟閲忥紒");
txt_psnQty_1.Focus();
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- this.ucBtnPrint1.rptParameter = "rpt_daa{" + ""
- + "," + txt_printRemark.Text.Trim()
+ this.ucBtnPrint1.rptParameter = "rpt_daa{"
+ + txt_printRemark.Text.Trim()
+ + "," +""
+ "," + ""
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
@@ -548,7 +554,7 @@
return;
}
this.ucBtnPrint98.rptParameter = "rpt_trace{" + ""
- + "," + txt_printRemark.Text.Trim()
+ + "," + txt_printRemark98.Text.Trim()
+ "," + ""
+ "," + txt_iCount_98.Text.Trim()
+ "," + 1
@@ -589,6 +595,6 @@
}
}
}
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3