~tjx/GsMesClient.git

			@@ -1,14 +1,12 @@
			using System;
			using DevExpress.XtraEditors;
			using DevExpress.XtraEditors.Controls;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Newtonsoft.Json;
			using System;
			using System.Collections.Generic;
			using System.Data;
			using System.Windows.Forms;
			using DevExpress.XtraEditors;
			using DevExpress.XtraEditors.Controls;
			using DevExpress.XtraGrid.Columns;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			using Newtonsoft.Json;

			namespace Gs.DevApp.DevFrm.Sys
			{
			@@ -25,18 +23,18 @@
			toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(this.GetType().FullName,gridView1, picCheckBox, this, "checkStatus", "", (value) =>
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (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;
			getTree();
			@@ -49,9 +47,8 @@
			txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
			txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
			txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
			}


			}

			/// <summary>
			/// 分页事件
			@@ -60,16 +57,9 @@
			/// <param name="pageSize"></param>
			private void PageBar1_PagerEvent(int curPage, int pageSize)
			{
			getPageList(1);
			getPageList(curPage);
			}
			private void ToolBarMenu1_btnLayoutClick(object sender, EventArgs e)
			{
			string _formNamespace=this.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>
			@@ -185,7 +175,7 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			getModel(rowGuid);
			}
			else
			{
			@@ -263,6 +253,8 @@
			lbGuid.Text = _rtn.rtnData;
			toolBarMenu1.isSetBtn = true;
			UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -287,13 +279,13 @@
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMain.BindingContext = new BindingContext();
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			gcMain1.BindingContext = new BindingContext();
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			pageBar1.RecordCount = dd.rtnData.total;//总记录数
			gridView1.BestFitColumns();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			{
			@@ -388,11 +380,12 @@
			dataTable.Rows.Add("XSCK(销售出库)");
			dataTable.Rows.Add("XSTH(销售退货)");
			dataTable.Rows.Add("WWPC(委外排产)");
			dataTable.Rows.Add("WWLL(委外领料)");
			dataTable.Rows.Add("WWTLSQ(委外退料申请)");
			dataTable.Rows.Add("WWTL(委外退料)");
			dataTable.Rows.Add("WWCLSQ(生产超领申请)");
			dataTable.Rows.Add("WWCLSQ(委外超领申请)");
			dataTable.Rows.Add("WWCL(委外超领)");
			dataTable.Rows.Add("WWBLSQ(生产补料申请)");
			dataTable.Rows.Add("WWBLSQ(委外补料申请)");
			dataTable.Rows.Add("WWBL(委外补料)");
			dataTable.Rows.Add("SJJYSQ(首检申请)");
			dataTable.Rows.Add("SJJY(首检检验)");
			@@ -403,6 +396,18 @@
			dataTable.Rows.Add("OQCSQ(出库检验申请)");
			dataTable.Rows.Add("OQC(出库检验)");
			dataTable.Rows.Add("TM(条码)");
			dataTable.Rows.Add("FHTZSQ(发货通知申请)");
			dataTable.Rows.Add("FHTZ(发货通知)");
			dataTable.Rows.Add("XSTHSQ(销售退货申请)");
			dataTable.Rows.Add("STRKSQ(受托入库申请)");
			dataTable.Rows.Add("STRK(受托入库)");
			dataTable.Rows.Add("STTLSQ(受托退料申请)");
			dataTable.Rows.Add("STTL(受托退料)");
			dataTable.Rows.Add("IQCYC(IQC异常)");
			dataTable.Rows.Add("IPQCYC(IPQC异常)");
			dataTable.Rows.Add("FQCYC(FQC异常)");
			dataTable.Rows.Add("ZSM(追溯码)");
			dataTable.Rows.Add("TB(托板码)");
			txt_docCode.Properties.DataSource = dataTable;
			txt_docCode.Properties.DisplayMember = "docCode"; // 显示的列
			txt_docCode.Properties.ValueMember = "docCode"; // 实际值的列
			@@ -496,6 +501,6 @@
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}


			}
			}