~tjx/GsMesClient.git

			@@ -100,6 +100,10 @@
			gcMx1.DataSource = _oldTable;
			gcMx1.ForceInitialize();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gridView1.BestFitColumns();
			}
			catch (Exception ex)
			{
			@@ -147,7 +151,7 @@
			this.ucBtnPrint1.btnAllClick += (s, e) =>
			{
			string rowGuid = lbMxGuid.Text.Trim();
			SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "采购入库");
			SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "生产退料");
			string strCodeList = "";
			string strAction = "";
			frm.UpdateParent += (ss, ee) =>
			@@ -441,9 +445,9 @@
			txt_tbl005.Focus();
			return;
			}
			if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))
			if ((txt_tbl005.Text.Trim()=="良品退料") && txt_chkOut.Checked)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择原因！");
			Gs.DevApp.ToolBox.MsgHelper.ShowError("良品退料不能自动生成补料单，请检查！");
			txt_tbl005.Focus();
			return;
			}
			@@ -527,7 +531,11 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null;
			System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
			_sbSqlWhere.Append(" and a.tbl023 in");
			_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
			_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -785,6 +793,8 @@
			{
			DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
			lbMxGuid.Text = row["tlid"].ToString();
			if (string.IsNullOrEmpty(lbMxGuid.Text))
			return;
			toolBarMenu1.guidKey = row["tlid"].ToString();
			txtWlid.Text = row["tld002"].ToString();
			txtWlgg.Text = row["tld004"].ToString();