~tjx/GsMesClient.git

			@@ -119,21 +119,15 @@
			this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.tabMx = new DevExpress.XtraTab.XtraTabControl();
			this.panel1 = new System.Windows.Forms.Panel();
			this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop();
			this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
			this.lbGuid = new System.Windows.Forms.Label();
			this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop();
			this.tabMxPage1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
			@@ -1187,13 +1181,7 @@
			this.gv_caa018,
			this.gridColumn6,
			this.gridColumn5,
			this.gridColumn4,
			this.gridColumn9,
			this.gridColumn8,
			this.gridColumn7,
			this.gridColumn10,
			this.gridColumn12,
			this.gridColumn11});
			this.gridColumn4});
			this.gridView1.GridControl = this.gcMain;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			@@ -1274,66 +1262,6 @@
			this.gridColumn4.Visible = true;
			this.gridColumn4.VisibleIndex = 33;
			this.gridColumn4.Width = 94;
			//
			// gridColumn9
			//
			this.gridColumn9.Caption = "模具编码";
			this.gridColumn9.MinWidth = 80;
			this.gridColumn9.Name = "gridColumn9";
			this.gridColumn9.OptionsColumn.AllowEdit = false;
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 34;
			this.gridColumn9.Width = 94;
			//
			// gridColumn8
			//
			this.gridColumn8.Caption = "模具名称";
			this.gridColumn8.MinWidth = 100;
			this.gridColumn8.Name = "gridColumn8";
			this.gridColumn8.OptionsColumn.AllowEdit = false;
			this.gridColumn8.Visible = true;
			this.gridColumn8.VisibleIndex = 35;
			this.gridColumn8.Width = 100;
			//
			// gridColumn7
			//
			this.gridColumn7.Caption = "模具规格";
			this.gridColumn7.MinWidth = 100;
			this.gridColumn7.Name = "gridColumn7";
			this.gridColumn7.OptionsColumn.AllowEdit = false;
			this.gridColumn7.Visible = true;
			this.gridColumn7.VisibleIndex = 36;
			this.gridColumn7.Width = 100;
			//
			// gridColumn10
			//
			this.gridColumn10.Caption = "模具状态";
			this.gridColumn10.MinWidth = 50;
			this.gridColumn10.Name = "gridColumn10";
			this.gridColumn10.OptionsColumn.AllowEdit = false;
			this.gridColumn10.Visible = true;
			this.gridColumn10.VisibleIndex = 37;
			this.gridColumn10.Width = 94;
			//
			// gridColumn12
			//
			this.gridColumn12.Caption = "模具库位名称";
			this.gridColumn12.MinWidth = 100;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.OptionsColumn.AllowEdit = false;
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 38;
			this.gridColumn12.Width = 100;
			//
			// gridColumn11
			//
			this.gridColumn11.Caption = "模具库位";
			this.gridColumn11.MinWidth = 80;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.OptionsColumn.AllowEdit = false;
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 39;
			this.gridColumn11.Width = 94;
			//
			// xtraTabControl1
			//
			@@ -1430,6 +1358,15 @@
			this.panel1.Size = new System.Drawing.Size(1126, 200);
			this.panel1.TabIndex = 1;
			//
			// txt_caa021
			//
			this.txt_caa021.IsReadly = false;
			this.txt_caa021.KeyFile = "";
			this.txt_caa021.Location = new System.Drawing.Point(85, 81);
			this.txt_caa021.Name = "txt_caa021";
			this.txt_caa021.Size = new System.Drawing.Size(160, 29);
			this.txt_caa021.TabIndex = 451;
			//
			// labelControl11
			//
			this.labelControl11.Location = new System.Drawing.Point(905, 150);
			@@ -1446,15 +1383,6 @@
			this.lbGuid.Name = "lbGuid";
			this.lbGuid.Size = new System.Drawing.Size(0, 21);
			this.lbGuid.TabIndex = 1;
			//
			// txt_caa021
			//
			this.txt_caa021.IsReadly = false;
			this.txt_caa021.KeyFile = "";
			this.txt_caa021.Location = new System.Drawing.Point(85, 81);
			this.txt_caa021.Name = "txt_caa021";
			this.txt_caa021.Size = new System.Drawing.Size(160, 29);
			this.txt_caa021.TabIndex = 451;
			//
			// Frm_Womcaa
			//
			@@ -1603,12 +1531,6 @@
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;