~tjx/GsMesClient.git

			@@ -1,8 +1,3 @@
			using System;
			using System.Collections.Generic;
			using System.Data;
			using System.Threading.Tasks;
			using System.Windows.Forms;
			using DevExpress.XtraEditors;
			using DevExpress.XtraEditors.Controls;
			using DevExpress.XtraGrid.Views.Grid;
			@@ -12,6 +7,11 @@
			using MES.Service.Modes;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using System;
			using System.Collections.Generic;
			using System.Data;
			using System.Threading.Tasks;
			using System.Windows.Forms;

			namespace Gs.DevApp.DevFrm
			{
			@@ -28,24 +28,25 @@
			toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
			toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
			toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			});
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			}, tips);
			Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
			{
			getModel(value);
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			});
			}, lbGuid);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			Task.Delay(100);
			getPageList(1);
			}
			@@ -69,7 +70,7 @@
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList);
			var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			@@ -143,7 +144,7 @@
			{
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			}

			@@ -158,14 +159,14 @@
			toolBarMenu1.isSetBtn = false;
			if (string.IsNullOrEmpty(txt_depotCode.Text.Trim()))
			{
			MsgHelper.Warning("仓库编码不能为空！");
			MsgHelper.ShowError("仓库编码不能为空！");
			txt_depotCode.Focus();
			return;
			}

			if (string.IsNullOrEmpty(txt_depotName.Text.Trim()))
			{
			MsgHelper.Warning("仓库名称不能为空！");
			MsgHelper.ShowError("仓库名称不能为空！");
			txt_depotName.Focus();
			return;
			}
			@@ -198,33 +199,36 @@
			}
			var _obj = new MesDepots
			{
			Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
			Guid = lbGuid.Text.Trim(),
			DepotCode = txt_depotCode.Text,
			DepotName = txt_depotName.Text,
			Description = txt_description.Text,
			Remark5=txt_remark5.Text.Trim(),
			list = lst
			};

			try
			{
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "EditModel",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			lbGuid.Text = _rtn.rtnData;
			toolBarMenu1.isSetBtn = true;
			var gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, false, gridViews);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			else
			MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}

			@@ -234,7 +238,7 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
			"", _sbSqlWhere.ToString());
			var json = JsonConvert.SerializeObject(pgq);
			@@ -246,16 +250,16 @@
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMain.BindingContext = new BindingContext();
			gcMain1.BindingContext = new BindingContext();
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			if (dt.Rows.Count > 0)
			{
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns();
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			@@ -298,7 +302,7 @@
			lbGuid.Text = strGuid;
			var gvList = new List<GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			var _job = JObject.Parse(strJson);
			var array = new JArray();
			foreach (var a in _job["rtnData"]["list"]) array.Add(a);