~tjx/GsMesClient.git

			@@ -14,7 +14,7 @@
			{
			public partial class WwBlcl : DevExpress.XtraEditors.XtraUserControl
			{

			string _ucCk = "";//仓库
			string _webServiceName = "WWBlManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			public string strType = "";
			@@ -23,7 +23,7 @@
			InitializeComponent();
			strType = _strType;
			txt_bl017.Text = _strType;
			// txt_bl017.Tag = "moren." + _strType;
			txt_bl017.Tag = "moren." + _strType;
			}
			protected override void OnCreateControl()
			{
			@@ -38,9 +38,11 @@
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx1);
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.getXmlConfig();
			Form parentForm = this.FindForm();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(this.GetType().FullName, gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			});
			@@ -53,11 +55,12 @@
			});
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			//设置仓库选择
			txt_bl010.getSuppler("");
			this.txt_bl010.EditChanged += (s, e) =>
			//设置组织
			this.txt_orgId.EditChanged += (s, e) =>
			{

			string orgdId = txt_orgId.GetId();
			if (string.IsNullOrEmpty(orgdId)) return;
			txt_bl010.getSuppler(orgdId, _ucCk);
			};
			//选择委外工单
			this.txt_aboutGuid.EditChanged += (s, e) =>
			@@ -92,10 +95,24 @@
			}
			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);
			}
			/// <summary>
			/// 日志
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
			{
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_blNo, gridView1);
			toolBarMenu1.guidKey = rowGuid;
			}

			/// <summary>
			/// 分页事件
			/// </summary>
			@@ -112,10 +129,16 @@
			/// <param name="e"></param>
			private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
			{
			Form parentForm;
			if (this.Parent is Form)
			parentForm = this.Parent as Form;
			else
			parentForm = this.Parent.Parent as Form;

			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, parentForm.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			@@ -231,7 +254,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);
			}
			}
			/// <summary>
			@@ -245,7 +268,7 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
			List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gridViews.Add(gvMx1);
			UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);

			}
			@@ -259,6 +282,13 @@
			toolBarMenu1.isSetBtn = false;
			string inGdId = txt_aboutGuid.GetId();//工单号
			string inCkId = txt_bl010.GetId();//发料仓
			string inFlOrg= txt_orgId.GetId();//发料组织
			if (string.IsNullOrEmpty(inFlOrg))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择发料组织！");
			txt_orgId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(inGdId))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单！");
			@@ -280,7 +310,7 @@
			var _obj = new
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			inOrgId = "",//
			inOrgId = inFlOrg,//发料组织
			inGdId = inGdId,//工单号
			inCkId = inCkId,//仓库
			inYy = txt_bl007.Text.Trim(),//原因
			@@ -288,6 +318,7 @@
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			if (gvMx1.DataRowCount <= 0)
			{
			@@ -323,11 +354,13 @@
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			lbGuid.Text = _rtn.rtnData;
			lbGuid.Text = _rtn.rtnData.outGuid;
			txt_blNo.Text = _rtn.rtnData.outNo;
			toolBarMenu1.isSetBtn = true;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			}
			}
			catch (Exception ex)
			@@ -344,7 +377,7 @@
			private void getPageList(int curPage)
			{
			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			// _sbSqlWhere += " and bl017=200";
			_sbSqlWhere += " and a.bl008='" + strType + "'";
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -354,16 +387,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();
			gridView1.BestFitColumns();
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			@@ -401,10 +434,12 @@
			if (_rtn.rtnCode > 0)
			{
			dynamic dy = _rtn.rtnData;
			_ucCk = dy.bl010;
			lbGuid.Text = strGuid;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			_ucCk = "";
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			foreach (var a in _job["rtnData"]["list"])
			@@ -562,5 +597,6 @@
			}
			}
			}

			}
			}