~tjx/GsMesClient.git

			@@ -6,7 +6,6 @@
			using System.Windows.Forms;
			using DevExpress.XtraEditors;
			using DevExpress.XtraEditors.Controls;
			using DevExpress.XtraGrid.Views.Base.ViewInfo;
			using DevExpress.XtraGrid.Views.Grid;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			@@ -54,16 +53,14 @@
			e.Graphics.DrawString(str, f, Brushes.Gray, r);
			};
			//设置仓库选择
			this.txt_depotsId.KeyFile = "depotId";
			this.txt_depotsId.EditChanged += (s, e) =>
			{
			txtDepotsId.Text = this.txt_depotsId.GetId();
			txtDepotsCode.Text = this.txt_depotsId.GetCode();
			};
			//设置供应商选择
			this.txt_suppId.KeyFile = "id";
			this.txt_suppId.EditChanged += (s, e) =>
			{
			txtSupplierId.Text = this.txt_suppId.GetId();
			txtSupplierCode.Text = this.txt_suppId.GetCode();
			};
			//选择需要入库的明细
			btnSelect.Click += (s, e) =>
			@@ -106,9 +103,14 @@
			};
			frm.ShowDialog();
			};

			btnTui.Click += (s, e) =>
			//验退
			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++)
			{
			@@ -116,28 +118,32 @@
			if (row != null && row["gvChk"].ToString().ToUpper() == "true".ToUpper())
			lst.Add(row["guid"].ToString());
			}
			// MessageBox.Show(lst.Count.ToString());
			if (lst.Count <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你需要退的物料！");
			return;
			}
			UcLoading _loading = new UcLoading();
			var _obj = lst;
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteModel",
			var strJson = await UtilityHelper.HttpPostAsync("",
			_webServiceName + "TuiMx",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			UtilityHelper.JumpToTab(xtraTabControl1, 0);
			getPageList(1, UtilityHelper.GetPageSize());

			}
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();
			};
			}

			/// <summary>
			/// 双击事件
			/// </summary>
			@@ -198,33 +204,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>
			/// 取消事件
			@@ -285,8 +353,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>
			@@ -379,7 +449,7 @@
			_obj.list.Add(new MesInvItemArnDetail
			{
			Guid = _guid,
			AboutGuid = Guid.Parse(row["aboutGuid"].ToString()),
			AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
			ItemId = int.Parse(row["itemId"].ToString()),
			Quantity = decimal.Parse(row["quantity"].ToString())
			});
			@@ -410,8 +480,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 + "'" +
			@@ -421,7 +492,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;
			@@ -432,16 +503,16 @@
			pageBar1.TotalPages = dddd;
			pageBar1.RecordCount = dd.rtnData.total; //记录总数
			pageBar1.CurrentPage = curPage; //当前页
			pageBar1.RowsCount = pageSize; //每页显示
			pageBar1.setTxt();
			}
			catch (Exception ex)
			{
			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))
			{
			@@ -450,13 +521,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);
			@@ -479,7 +551,6 @@
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();

			}
			else
			{
			@@ -495,6 +566,7 @@
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();
			}

			/// <summary>
			@@ -542,5 +614,7 @@
			}
			}
			}


			}
			}