~tjx/GsMesClient.git

			@@ -155,12 +155,10 @@
			this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
			<<<<<<< HEAD
			this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();
			=======
			this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			@@ -168,6 +166,8 @@
			this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();
			this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			<<<<<<< HEAD
			=======
			>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
			=======
			this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -175,6 +175,7 @@
			this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
			>>>>>>> Stashed changes
			>>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -1564,8 +1565,12 @@
			this.picCheckBox.TabStop = false;
			this.picCheckBox.Visible = false;
			//
			<<<<<<< HEAD

			=======
			<<<<<<< Updated upstream
			<<<<<<< HEAD
			>>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096
			// ucRptCgdhd1
			//
			this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
			@@ -1573,7 +1578,7 @@
			this.ucRptCgdhd1.Name = "ucRptCgdhd1";
			this.ucRptCgdhd1.Size = new System.Drawing.Size(1573, 570);
			this.ucRptCgdhd1.TabIndex = 0;
			=======

			// txt_mxStatue
			=======
			// gridColumn23
			@@ -1606,6 +1611,9 @@
			this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);
			this.layoutControlItem2.Text = "到货单号";
			this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
			<<<<<<< HEAD

			=======
			>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
			=======
			this.gridColumn25.Caption = "入库数量";
			@@ -1626,6 +1634,7 @@
			this.gridColumn26.VisibleIndex = 18;
			this.gridColumn26.Width = 112;
			>>>>>>> Stashed changes
			>>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096
			//
			// Frm_MesInvItemArn
			//
			@@ -1802,15 +1811,18 @@
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
			<<<<<<< HEAD

			private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
			private Rpt.UcRptCgdhd ucRptCgdhd1;
			=======

			private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
			private DevExpress.XtraEditors.TextEdit txt_mxStatue;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
			<<<<<<< HEAD

			=======
			<<<<<<< Updated upstream
			>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
			=======
			@@ -1819,5 +1831,6 @@
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
			>>>>>>> Stashed changes
			>>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096
			}
			}