From 2ffa3cda080d1990775fe42e13ced433d27ca3e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 10 十二月 2024 10:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs | 186 ++++++++++++++++++++++++----------------------
1 files changed, 98 insertions(+), 88 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs
index 57cac79..3e2902e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs
@@ -55,7 +55,6 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
//璁剧疆浠撳簱閫夋嫨
- this.txt_qt008.KeyFile = "depotId";
this.txt_qt008.EditChanged += (s, e) =>
{
@@ -81,10 +80,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -150,7 +149,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -236,79 +235,90 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
- //toolBarMenu1.isSetBtn = false;
- //string inGys = txt_qt018.GetId();
- //string inCjId = txt_qt011.GetId();
- //if (string.IsNullOrEmpty(inGys))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
- // txt_qt018.Focus();
- // return;
- //}
- //if (string.IsNullOrEmpty(inCjId))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- // txt_qt011.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.Text.Trim(),//鐢宠閮ㄩ棬
- // inXsdh = txt_qt021.Text.Trim(),//閿�鍞崟鍙�
- // inRkyy = txt_qt010.Text.Trim(),//鍏ュ簱鍘熷洜
- // list = new List<dynamic>(),
- //};
- //gvMx1.CloseEditor();
- //gvMx1.UpdateCurrentRow();
- //if (gvMx1.DataRowCount <= 0)
- //{
- // MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
- // return;
- //}
- //for (var i = 0; i < gvMx1.DataRowCount; i++)
- //{
- // var row = gvMx1.GetDataRow(i);
- // if (row != null)
- // {
- // Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- // //string _msl = row["quantity"].ToString();
- // //if (string.IsNullOrEmpty(_msl))
- // //{
- // // MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
- // // return;
- // //}
- // _obj.list.Add(new
- // {
- // Guid = _guid,
- // ItemId = (row["itemId"].ToString()),
- // Sqsl = (row["qd007"].ToString()),
- // Bz = (row["qd010"].ToString()),
- // });
- // }
- //}
- //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;
- // UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
- // }
- //}
- //catch (Exception ex)
- //{
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- //}
+ toolBarMenu1.isSetBtn = false;
+ string inCusId = txt_qt018.GetId();
+ string inCkId = txt_qt008.GetId();
+ string inLlrId = txt_qt022.GetId();
+ string inDepart = txt_qt009.GetId();
+ string inScgdId = txt_qt006.Text.Trim();
+ if (string.IsNullOrEmpty(inCusId))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨瀹㈡埛锛�");
+ txt_qt018.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(inCkId))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ txt_qt008.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(inLlrId))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨棰嗘枡浜猴紒");
+ txt_qt022.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(),//鍏ュ簱绫诲瀷
+ inCusId = inCusId,//瀹㈡埛
+ inCkId = inCkId,//浠撳簱
+ inDepart = inDepart,//鐢宠閮ㄩ棬
+ inXsdh = txt_qt021.Text.Trim(),//閿�鍞崟鍙�
+ inScgdId = inScgdId,//鐢熶骇宸ュ崟鍙�
+ inLlrId = inLlrId,//棰嗘枡浜�
+ inRkyy = txt_qt010.Text.Trim(),//鍘熷洜
+ list = new List<dynamic>(),
+ };
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ if (gvMx1.DataRowCount <= 0)
+ {
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+ return;
+ }
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ {
+ Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ //string _msl = row["quantity"].ToString();
+ //if (string.IsNullOrEmpty(_msl))
+ //{
+ // MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+ // return;
+ //}
+ _obj.list.Add(new
+ {
+ Guid = _guid,
+ ItemId = (row["itemId"].ToString()),
+ Sqsl = (row["qd007"].ToString()),
+ Bz = (row["qd010"].ToString()),
+ });
+ }
+ }
+ 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;
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
/// <summary>
@@ -316,15 +326,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -352,7 +362,7 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
@@ -410,7 +420,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
_toolCk(1);
}
@@ -421,7 +431,7 @@
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private async void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
_toolCk(0);
}
@@ -430,7 +440,7 @@
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
- private async void _toolCk(int _inFieldValue)
+ private void _toolCk(int _inFieldValue)
{
string strMsg = "";
switch (_inFieldValue)
@@ -452,7 +462,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
@@ -460,7 +470,7 @@
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -477,7 +487,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
{
@@ -488,7 +498,7 @@
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
}
-
+
private void repositoryItemSearchLookUpEdit1_EditValueChanged_1(object sender, EventArgs e)
{
SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
--
Gitblit v1.9.3