~tjx/GsMesClient.git

			@@ -87,6 +87,7 @@
			this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
			@@ -192,6 +193,7 @@
			this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			@@ -402,7 +404,8 @@
			this.gridColumn39,
			this.gridColumn30,
			this.gridColumn34,
			this.gridColumn19});
			this.gridColumn19,
			this.gridColumn41});
			this.gridView1.GridControl = this.gcMain1;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			@@ -824,6 +827,16 @@
			this.gridColumn19.Visible = true;
			this.gridColumn19.VisibleIndex = 13;
			this.gridColumn19.Width = 94;
			//
			// gridColumn41
			//
			this.gridColumn41.Caption = "Erp锁";
			this.gridColumn41.FieldName = "txtColor";
			this.gridColumn41.MinWidth = 25;
			this.gridColumn41.Name = "gridColumn41";
			this.gridColumn41.Visible = true;
			this.gridColumn41.VisibleIndex = 22;
			this.gridColumn41.Width = 94;
			//
			// pageBar1
			//
			@@ -1726,7 +1739,8 @@
			this.gvMx1scrapqty,
			this.gridColumn17,
			this.gridColumn29,
			this.gridColumn18});
			this.gridColumn18,
			this.gridColumn40});
			this.gvMx1.GridControl = this.gcMx1;
			this.gvMx1.Name = "gvMx1";
			this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
			@@ -1831,7 +1845,7 @@
			this.gvMx1cab009.Name = "gvMx1cab009";
			this.gvMx1cab009.Tag = "query_a.CAB009";
			this.gvMx1cab009.Visible = true;
			this.gvMx1cab009.VisibleIndex = 7;
			this.gvMx1cab009.VisibleIndex = 8;
			this.gvMx1cab009.Width = 94;
			//
			// gvMx1cab007
			@@ -1843,7 +1857,7 @@
			this.gvMx1cab007.Name = "gvMx1cab007";
			this.gvMx1cab007.Tag = "query_a.CAB007";
			this.gvMx1cab007.Visible = true;
			this.gvMx1cab007.VisibleIndex = 8;
			this.gvMx1cab007.VisibleIndex = 9;
			this.gvMx1cab007.Width = 94;
			//
			// gvMx1cab014
			@@ -1855,7 +1869,7 @@
			this.gvMx1cab014.Name = "gvMx1cab014";
			this.gvMx1cab014.Tag = "query_a.CAB014";
			this.gvMx1cab014.Visible = true;
			this.gvMx1cab014.VisibleIndex = 9;
			this.gvMx1cab014.VisibleIndex = 10;
			this.gvMx1cab014.Width = 94;
			//
			// gridColumn11
			@@ -1865,7 +1879,7 @@
			this.gridColumn11.MinWidth = 25;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 19;
			this.gridColumn11.VisibleIndex = 20;
			this.gridColumn11.Width = 94;
			//
			// gridColumn12
			@@ -1875,7 +1889,7 @@
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 20;
			this.gridColumn12.VisibleIndex = 21;
			this.gridColumn12.Width = 94;
			//
			// gridColumn13
			@@ -1885,7 +1899,7 @@
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 21;
			this.gridColumn13.VisibleIndex = 22;
			this.gridColumn13.Width = 94;
			//
			// gvMx1mtono
			@@ -1907,7 +1921,7 @@
			this.gvMx1numerator.Name = "gvMx1numerator";
			this.gvMx1numerator.Tag = "query_a.NUMERATOR";
			this.gvMx1numerator.Visible = true;
			this.gvMx1numerator.VisibleIndex = 10;
			this.gvMx1numerator.VisibleIndex = 11;
			this.gvMx1numerator.Width = 94;
			//
			// gvMx1denominator
			@@ -1919,7 +1933,7 @@
			this.gvMx1denominator.Name = "gvMx1denominator";
			this.gvMx1denominator.Tag = "query_a.DENOMINATOR";
			this.gvMx1denominator.Visible = true;
			this.gvMx1denominator.VisibleIndex = 11;
			this.gvMx1denominator.VisibleIndex = 12;
			this.gvMx1denominator.Width = 94;
			//
			// gvMx1depotCode
			@@ -1931,7 +1945,7 @@
			this.gvMx1depotCode.Name = "gvMx1depotCode";
			this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
			this.gvMx1depotCode.Visible = true;
			this.gvMx1depotCode.VisibleIndex = 12;
			this.gvMx1depotCode.VisibleIndex = 13;
			this.gvMx1depotCode.Width = 94;
			//
			// gridColumn15
			@@ -1941,7 +1955,7 @@
			this.gridColumn15.MinWidth = 25;
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 13;
			this.gridColumn15.VisibleIndex = 14;
			this.gridColumn15.Width = 94;
			//
			// gvMx1issueType
			@@ -1953,7 +1967,7 @@
			this.gvMx1issueType.Name = "gvMx1issueType";
			this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE";
			this.gvMx1issueType.Visible = true;
			this.gvMx1issueType.VisibleIndex = 14;
			this.gvMx1issueType.VisibleIndex = 15;
			this.gvMx1issueType.Width = 94;
			//
			// gridColumn16
			@@ -1963,7 +1977,7 @@
			this.gridColumn16.MinWidth = 25;
			this.gridColumn16.Name = "gridColumn16";
			this.gridColumn16.Visible = true;
			this.gridColumn16.VisibleIndex = 15;
			this.gridColumn16.VisibleIndex = 16;
			this.gridColumn16.Width = 94;
			//
			// gvMx1scraprate
			@@ -1975,7 +1989,7 @@
			this.gvMx1scraprate.Name = "gvMx1scraprate";
			this.gvMx1scraprate.Tag = "query_a.SCRAPRATE";
			this.gvMx1scraprate.Visible = true;
			this.gvMx1scraprate.VisibleIndex = 16;
			this.gvMx1scraprate.VisibleIndex = 17;
			this.gvMx1scraprate.Width = 94;
			//
			// gvMx1scrapqty
			@@ -1987,7 +2001,7 @@
			this.gvMx1scrapqty.Name = "gvMx1scrapqty";
			this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY";
			this.gvMx1scrapqty.Visible = true;
			this.gvMx1scrapqty.VisibleIndex = 17;
			this.gvMx1scrapqty.VisibleIndex = 18;
			this.gvMx1scrapqty.Width = 94;
			//
			// gridColumn17
			@@ -1997,7 +2011,7 @@
			this.gridColumn17.MinWidth = 25;
			this.gridColumn17.Name = "gridColumn17";
			this.gridColumn17.Visible = true;
			this.gridColumn17.VisibleIndex = 18;
			this.gridColumn17.VisibleIndex = 19;
			this.gridColumn17.Width = 94;
			//
			// gridColumn29
			@@ -2007,7 +2021,7 @@
			this.gridColumn29.MinWidth = 25;
			this.gridColumn29.Name = "gridColumn29";
			this.gridColumn29.Visible = true;
			this.gridColumn29.VisibleIndex = 22;
			this.gridColumn29.VisibleIndex = 23;
			this.gridColumn29.Width = 94;
			//
			// gridColumn18
			@@ -2017,6 +2031,20 @@
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Width = 94;
			//
			// gridColumn40
			//
			this.gridColumn40.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
			this.gridColumn40.AppearanceCell.Options.UseForeColor = true;
			this.gridColumn40.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
			this.gridColumn40.AppearanceHeader.Options.UseForeColor = true;
			this.gridColumn40.Caption = "需领用量取整";
			this.gridColumn40.FieldName = "xsqz";
			this.gridColumn40.MinWidth = 25;
			this.gridColumn40.Name = "gridColumn40";
			this.gridColumn40.Visible = true;
			this.gridColumn40.VisibleIndex = 7;
			this.gridColumn40.Width = 94;
			//
			// Frm_Womcaa
			//
			@@ -2277,5 +2305,7 @@
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
			}
			}