~tjx/GsMesClient.git

			@@ -76,29 +76,76 @@
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			var lst = new List<string>();
			lst = ee.StringList;
			var _obj = lst;
			var strReturn = UtilityHelper.HttpPost("",
			"MesInvItemArnDetailManager/GetListPageByCgmxGuid",
			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++)
			try
			{
			_oldTable.ImportRow(sourceRows[i]);
			var lst = new List<string>();
			lst = ee.StringList;
			var _obj = lst;
			var strReturn = UtilityHelper.HttpPost("",
			"MesInvItemArnDetailManager/GetListPageByCgmxGuid",
			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();
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gcMx1.ForceInitialize();
			catch (Exception ex)
			{

			MessageBox.Show(ex.Message);
			}

			};
			frm.ShowDialog();
			};
			}

			//验退
			btnTui.Click += async (s, e) =>
			{
			if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("暂未保存，不能退货！");
			return;
			}
			var lst = new List<string>();
			for (var i = 0; i < gvMx1.DataRowCount; i++)
			{
			var row = gvMx1.GetDataRow(i);
			if (row != null && row["gvChk"].ToString().ToUpper() == "true".ToUpper())
			lst.Add(row["guid"].ToString());
			}
			if (lst.Count <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你需要退的物料！");
			return;
			}
			UcLoading _loading = new UcLoading();
			var _obj = lst;
			try
			{
			var strJson = await UtilityHelper.HttpPostAsync("",
			_webServiceName + "TuiMx",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{

			}
			MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();
			};
			}
			/// <summary>
			/// 双击事件
			/// </summary>
			@@ -159,33 +206,95 @@
			}

			/// <summary>
			/// 反检验
			/// 反检验
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			/// <exception cref="NotImplementedException"></exception>
			private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
			private async void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
			{
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_billNo, gridView1);
			lbGuid, txt_billNo, gridView1, "billNo");
			toolBarMenu1.guidKey = rowGuid;
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定撤回已提交的检验吗？"))
			return;
			UcLoading _loading = new UcLoading();
			var _obj = new
			{
			guid = rowGuid,
			};
			try
			{
			var strJson = await UtilityHelper.HttpPostAsync("",
			_webServiceName + "EditModelSubmitF",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg);
			if (_rtn.rtnCode > 0)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			getModel(lbGuid.Text.Trim(), false, 999);
			else
			getPageList(1, UtilityHelper.GetPageSize());
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();
			}

			/// <summary>
			/// 检验
			/// 检验
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			/// <exception cref="NotImplementedException"></exception>
			private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
			private async void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
			{
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_billNo, gridView1);
			lbGuid, txt_billNo, gridView1, "billNo");
			toolBarMenu1.guidKey = rowGuid;
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提交检验吗？"))
			return;
			UcLoading _loading = new UcLoading();
			var _obj = new
			{
			guid = rowGuid,
			};
			try
			{
			var strJson = await UtilityHelper.HttpPostAsync("",
			_webServiceName + "EditModelSubmit",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg);
			if (_rtn.rtnCode > 0)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			getModel(lbGuid.Text.Trim(), false, 999);
			else
			getPageList(1, UtilityHelper.GetPageSize());
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();
			}
			/// <summary>
			/// 取消事件
			@@ -212,16 +321,17 @@
			MsgHelper.Warning("请先选择你要操作的行！");
			return;
			}

			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
			return;
			var lst = new List<dynamic>();
			lst.Add(rowGuid);
			var _obj = lst;
			var _obj = new
			{
			guid = rowGuid,
			mxGuid = Guid.Empty.ToString(),
			};
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteModel",
			_webServiceName + "DeleteModelOrMx",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			@@ -245,8 +355,10 @@
			/// <param name="e"></param>
			private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
			{
			UtilityHelper.JumpToTab(xtraTabControl1, 0);
			getPageList(1, UtilityHelper.GetPageSize());
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			getModel(lbGuid.Text.Trim(), false, 999);
			else
			getPageList(1, UtilityHelper.GetPageSize());
			}

			/// <summary>
			@@ -339,9 +451,8 @@
			_obj.list.Add(new MesInvItemArnDetail
			{
			Guid = _guid,
			AboutGuid = Guid.Parse(row["aboutGuid"].ToString()),
			ItemNo = row["itemNo"].ToString(),
			//ItemId= int.Parse( row["itemId"].ToString()),
			AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
			ItemId = int.Parse(row["itemId"].ToString()),
			Quantity = decimal.Parse(row["quantity"].ToString())
			});
			}
			@@ -371,8 +482,9 @@
			/// </summary>
			/// <param name="curPage">第几页</param>
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage, int pageSize)
			private async void getPageList(int curPage, int pageSize)
			{
			UcLoading _loading = new UcLoading();
			var _sbSqlWhere = new StringBuilder();
			foreach (var itm in _filterList)
			_sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
			@@ -382,7 +494,7 @@
			var json = JsonConvert.SerializeObject(pgq);
			try
			{
			var strReturn = UtilityHelper.HttpPost("",
			var strReturn = await UtilityHelper.HttpPostAsync("",
			_webServiceName + "GetListPage", json);
			var dd = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = dd.rtnData.list;
			@@ -400,9 +512,10 @@
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();
			}

			private void getModel(string strGuid, bool isEdit, int tabIdx)
			private async void getModel(string strGuid, bool isEdit, int tabIdx)
			{
			if (string.IsNullOrEmpty(strGuid))
			{
			@@ -411,13 +524,14 @@
			}

			UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
			UcLoading _loading = new UcLoading();
			var _obj = new
			{
			guid = strGuid //主建
			};
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			var strJson = await UtilityHelper.HttpPostAsync("",
			_webServiceName + "GetModel",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			@@ -431,7 +545,7 @@
			gvList);
			var _job = JObject.Parse(strJson);
			var array = new JArray();
			foreach (var a in _job["rtnData"]["list"]) array.Add(a);
			foreach (var a in _job["rtnData"]["listDya"]) array.Add(a);
			var dt =
			JsonConvert.DeserializeObject<DataTable>(
			array.ToString());
			@@ -455,6 +569,7 @@
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();
			}

			/// <summary>
			@@ -479,16 +594,21 @@
			gvMx1.DeleteRow(rowhandle);
			return;
			}
			var strJson = "";
			var lst = new List<string>();
			lst.Add(mxGuid);
			var _obj = new
			{
			guid = lbGuid.Text.Trim(),
			mxGuid = mxGuid,
			};
			try
			{
			strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteModelMx",
			JsonConvert.SerializeObject(lst));
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteModelOrMx",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
			if (_rtn.rtnCode > 0)
			{
			if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
			}
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)