~tjx/GsMesClient.git

			@@ -1835,11 +1835,11 @@
			// gridView2
			//
			this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gridColumn7,
			this.gridColumn8,
			this.gridColumn9,
			this.gridColumn10,
			this.gridColumn11});
			this.gridColumn11,
			this.gridColumn7});
			this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
			this.gridView2.Name = "gridView2";
			this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
			@@ -1861,8 +1861,6 @@
			this.gridColumn8.FieldName = "id";
			this.gridColumn8.MinWidth = 80;
			this.gridColumn8.Name = "gridColumn8";
			this.gridColumn8.Visible = true;
			this.gridColumn8.VisibleIndex = 1;
			this.gridColumn8.Width = 80;
			//
			// gridColumn9
			@@ -1872,7 +1870,7 @@
			this.gridColumn9.MinWidth = 100;
			this.gridColumn9.Name = "gridColumn9";
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 2;
			this.gridColumn9.VisibleIndex = 1;
			this.gridColumn9.Width = 100;
			//
			// gridColumn10
			@@ -1882,7 +1880,7 @@
			this.gridColumn10.MinWidth = 120;
			this.gridColumn10.Name = "gridColumn10";
			this.gridColumn10.Visible = true;
			this.gridColumn10.VisibleIndex = 3;
			this.gridColumn10.VisibleIndex = 2;
			this.gridColumn10.Width = 120;
			//
			// gridColumn11
			@@ -1892,7 +1890,7 @@
			this.gridColumn11.MinWidth = 120;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 4;
			this.gridColumn11.VisibleIndex = 3;
			this.gridColumn11.Width = 120;
			//
			// gvMx1qd002
			@@ -2079,7 +2077,7 @@
			//
			this.xtraTabPage3.Controls.Add(this.gcMx2);
			this.xtraTabPage3.Name = "xtraTabPage3";
			this.xtraTabPage3.Size = new System.Drawing.Size(1330, 323);
			this.xtraTabPage3.Size = new System.Drawing.Size(1330, 319);
			this.xtraTabPage3.Text = "已打印条码明细";
			//
			// gcMx2
			@@ -2088,7 +2086,7 @@
			this.gcMx2.Location = new System.Drawing.Point(0, 0);
			this.gcMx2.MainView = this.gvMx2;
			this.gcMx2.Name = "gcMx2";
			this.gcMx2.Size = new System.Drawing.Size(1330, 323);
			this.gcMx2.Size = new System.Drawing.Size(1330, 319);
			this.gcMx2.TabIndex = 2;
			this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
			this.gvMx2});