From f518944447f2f57c69d63e397326b933d561bd95 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 30 十一月 2024 23:09:56 +0800
Subject: [PATCH] 11
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
index f883f0d..777a4f4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
@@ -45,11 +45,50 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
txt_daahb013.EditChanged += Txt_daahb013_EditChanged;
+ //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
+ btnSelect.Click += (s, e) =>
+ {
+ if (string.IsNullOrEmpty(this.txt_daahb013.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
+ return;
+ }
+ var frm = new SelectWomdaahb(this.txt_daahb013.Text);
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<string>();
+ lst = ee.StringList;
+ var _obj = lst;
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectViewResult",
+ JsonConvert.SerializeObject(_obj));
+ var dt = UtilityHelper.ReturnToList(strReturn);
+ DataTable _newTable = dt.rtnData;
+ DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _oldTable;
+ gcMx1.ForceInitialize();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ };
}
private void Txt_daahb013_EditChanged(object sender, EventArgs e)
{
- txt_daahb015.getSuppler(txt_daahb013.GetId());
+ string workGuid = this.txt_daahb013.GetGuid();
+ txt_daahb015.getSuppler(workGuid);
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -197,6 +236,7 @@
lbGuid.Text = "";
List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
@@ -208,16 +248,61 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
+ string workId = txt_daahb013.GetId();
+ if (string.IsNullOrEmpty(workId.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- // txt_account.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
+ txt_daahb013.Focus();
return;
}
+ string lineId = txt_daahb015.GetId();
+ //if (string.IsNullOrEmpty(lineId.Trim()))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浜х嚎锛�");
+ // txt_daahb015.Focus();
+ // return;
+ //}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ bz = txt_daahb009.Text.Trim(),
+ cjId = workId,
+ cxId = lineId,
+ 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,
+ AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["daaGuid"].ToString()),
+ LineId = 1,//浜х嚎id
+ //Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
+ //Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
+ //Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
+ //Bz = row["daa009"].ToString(),//澶囨敞
+ //Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
+ //Pcsl = row["daa008"].ToString()//鎺掍骇鏁伴噺
+ });
+ }
+ }
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
--
Gitblit v1.9.3