~tjx/GsMesClient.git

			@@ -14,7 +14,6 @@
			{
			public partial class UcBlcl : DevExpress.XtraEditors.XtraUserControl
			{
			string _ucCk = "";//仓库
			string _ucGd = "";//工单
			string _webServiceName = "MesItemBlManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			@@ -26,7 +25,6 @@
			txt_bl017.Text = _strType;
			txt_bl017.Tag = "moren." + _strType;
			}

			protected override void OnCreateControl()
			{
			base.OnCreateControl();
			@@ -41,23 +39,20 @@
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
			this.toolBarMenu1.getXmlConfig();
			Form parentForm = this.FindForm();
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gridView1);
			Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(parentForm.GetType().FullName, gvList);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
			{
			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;
			//设置组织
			@@ -65,13 +60,7 @@
			{
			string orgdId = txt_orgId.GetId();
			if (string.IsNullOrEmpty(orgdId)) return;
			txt_bl010.getSuppler(orgdId, _ucCk);
			txt_aboutGuid.getSuppler(orgdId, _ucGd);
			};
			//设置仓库选择
			this.txt_bl010.EditChanged += (s, e) =>
			{

			txt_aboutGuid.getSuppler(orgdId, _ucGd, "and ( daa018<>'S:暂停') and ( daa018<>'W:完工')");
			};
			//设置工单
			this.txt_aboutGuid.EditChanged += (s, e) =>
			@@ -81,48 +70,76 @@
			txt_bl002.Text = txt_aboutGuid.GetPrdNo();
			txt_bl014.Text = txt_aboutGuid.GetPrdName();
			txt_bl015.Text = txt_aboutGuid.GetPrdModel();
			txt_bl011.Text = txt_aboutGuid.GetWorkName();
			txt_dptName.Text = txt_aboutGuid.GetWorkName();
			txt_bl012.Text = txt_aboutGuid.GetWorkXb();
			txt_bl013.Text = txt_aboutGuid.GetRwd();
			var _obj = new
			txt_tldh.Text = txt_aboutGuid.GetTldh();
			};

			//选择需要入库的明细
			btnSelect.Click += (s, e) =>
			{
			if (string.IsNullOrEmpty(this.txt_orgId.GetId()))
			{
			currentPage = 1,
			everyPageSize = 999999,
			sortName = "",
			keyWhere = "",
			daaGuid = strGdId
			MsgHelper.Warning("请选择生产组织！");
			txt_orgId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(this.txt_aboutGuid.GetId()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择生产工单！");
			return;
			}
			var frm = new UcBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = ee.DynamicList;
			DataTable _Table = (DataTable)gcMx1.DataSource;
			int idx = 1;
			foreach (dynamic dym in lst)
			{
			DataRow _row = _Table.NewRow();
			_row["bld001"] = dym.gdh;//工单号
			_row["bld002"] = dym.itemNo;//物料编号
			_row["bld003"] = dym.itemName;//物料名称
			_row["bld004"] = dym.itemModel;//规格型号
			_row["dwName"] = dym.dwName;
			_row["dabGuid"] = dym.dabGuid;
			_row["bld013"] = idx.ToString();//项次
			_Table.Rows.Add(_row);
			idx++;
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _Table;
			gcMx1.ForceInitialize();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.BestFitColumns();
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			var json = JsonConvert.SerializeObject(_obj);
			try
			{
			var strReturn = UtilityHelper.HttpPost("",
			"WomdaaManager/GetListSelectDab", json);
			var rtn = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = rtn.rtnData.list;
			this.repositoryItemSearchLookUpEdit1.DataSource = dt;
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			frm.ShowDialog();
			};
			}
			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_btnLayoutClick(object sender, EventArgs e)
			{
			Form parentForm = this.FindForm();
			string _formNamespace = parentForm.GetType().FullName;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gridView1);
			Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
			DevFrm.ShowDialog();
			}
			/// <summary>
			/// 日志
			/// </summary>
			@@ -152,10 +169,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();
			}
			@@ -264,13 +287,13 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			getModel(rowGuid);
			}
			else
			{
			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>
			@@ -284,7 +307,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);

			}
			@@ -298,7 +321,6 @@
			toolBarMenu1.isSetBtn = false;
			string inOrgId = txt_orgId.GetId();//工单号
			string inGdId = txt_aboutGuid.GetId();//工单号
			string inCkId = txt_bl010.GetId();//发料仓
			if (string.IsNullOrEmpty(inGdId))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单！");
			@@ -309,12 +331,6 @@
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单！");
			txt_aboutGuid.Focus();
			return;
			}
			if (string.IsNullOrEmpty(inCkId))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择仓库！");
			txt_bl010.Focus();
			return;
			}
			if (string.IsNullOrEmpty(txt_bl017.Text.Trim()))
			@@ -328,12 +344,12 @@
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			inOrgId = inOrgId,//工单号
			inGdId = inGdId,//工单号
			inCkId = inCkId,//仓库
			inYy = txt_bl007.Text.Trim(),//原因
			inType = txt_bl017.Text.Trim(),
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			if (gvMx1.DataRowCount <= 0)
			{
			@@ -374,8 +390,9 @@
			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 = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -391,7 +408,7 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			_sbSqlWhere += " and a.bl008='" + strType + "'";
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			@@ -402,16 +419,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;//当前页
			@@ -428,6 +445,11 @@
			}

			}

			/// <summary>
			/// 读取实体
			/// </summary>
			/// <param name="strGuid"></param>
			private void getModel(string strGuid)
			{
			bool isEdit = false;
			@@ -449,13 +471,11 @@
			if (_rtn.rtnCode > 0)
			{
			dynamic dy = _rtn.rtnData;
			_ucCk = dy.bl010;
			_ucGd = dy.aboutGuid;
			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);
			_ucCk = "";
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			_ucGd = "";
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			@@ -470,6 +490,7 @@
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			else
			{
			@@ -561,17 +582,6 @@
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
			{
			SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
			DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
			gvMx1.SetFocusedRowCellValue("bld001", SelectedDataRow["gdh"]);
			gvMx1.SetFocusedRowCellValue("bld002", SelectedDataRow["itemNo"]);
			gvMx1.SetFocusedRowCellValue("bld003", SelectedDataRow["itemName"]);
			gvMx1.SetFocusedRowCellValue("bld004", SelectedDataRow["itemModel"]);
			gvMx1.SetFocusedRowCellValue("dwName", SelectedDataRow["dwName"]);
			gvMx1.SetFocusedRowCellValue("dabGuid", SelectedDataRow["dabGuid"]);
			}
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{