~tjx/GsMesClient.git

			@@ -128,7 +128,7 @@
			private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
			{
			string rowGuid = "", rowName = "";
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "itemNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			@@ -196,7 +196,7 @@
			lbGuid.Text = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);

			this.txt_itemId.ReadOnly = true;
			}
			private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
			{
			@@ -211,7 +211,7 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);

			getModel(rowGuid);

			txt_itemId.Enabled = false;
			}

			/// <summary>
			@@ -291,7 +291,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 b.FSubsidiary in");
			_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
			_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
			var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
			var json = JsonConvert.SerializeObject(pgq);
			try
			@@ -387,7 +391,7 @@
			;
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "itemNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");