~tjx/GsMesClient.git

			@@ -40,17 +40,17 @@
			this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
			@@ -85,9 +85,9 @@
			this.gridColumn6,
			this.gridColumn7,
			this.gridColumn8,
			this.gridColumn9,
			this.gridColumn10,
			this.gridColumn12});
			this.gridColumn12,
			this.gridColumn9});
			this.gridView1.GridControl = this.gcMain;
			this.gridView1.Name = "gridView1";
			this.gridView1.OptionsFind.ShowSearchNavButtons = false;
			@@ -99,6 +99,7 @@
			this.gv_operationTime.AppearanceCell.Options.UseFont = true;
			this.gv_operationTime.Caption = "入库单号";
			this.gv_operationTime.FieldName = "rkdh";
			this.gv_operationTime.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
			this.gv_operationTime.MinWidth = 10;
			this.gv_operationTime.Name = "gv_operationTime";
			this.gv_operationTime.OptionsColumn.AllowEdit = false;
			@@ -152,6 +153,16 @@
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 4;
			this.gridColumn2.Width = 94;
			//
			// gridColumn11
			//
			this.gridColumn11.Caption = "物料名称";
			this.gridColumn11.FieldName = "itemName";
			this.gridColumn11.MinWidth = 25;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 11;
			this.gridColumn11.Width = 94;
			//
			// gridColumn3
			//
			@@ -213,14 +224,33 @@
			this.gridColumn8.VisibleIndex = 10;
			this.gridColumn8.Width = 94;
			//
			// gridColumn10
			//
			this.gridColumn10.Caption = "明细GUID";
			this.gridColumn10.FieldName = "guid";
			this.gridColumn10.MinWidth = 25;
			this.gridColumn10.Name = "gridColumn10";
			this.gridColumn10.Width = 94;
			//
			// gridColumn12
			//
			this.gridColumn12.Caption = "车间";
			this.gridColumn12.FieldName = "workShop";
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 12;
			this.gridColumn12.Width = 94;
			//
			// gridColumn9
			//
			this.gridColumn9.Caption = "选择";
			this.gridColumn9.ColumnEdit = this.repositoryItemButtonEdit1;
			this.gridColumn9.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
			this.gridColumn9.MinWidth = 25;
			this.gridColumn9.Name = "gridColumn9";
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 11;
			this.gridColumn9.VisibleIndex = 13;
			this.gridColumn9.Width = 94;
			//
			// repositoryItemButtonEdit1
			@@ -233,34 +263,6 @@
			this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
			this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
			this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
			//
			// gridColumn10
			//
			this.gridColumn10.Caption = "明细GUID";
			this.gridColumn10.FieldName = "guid";
			this.gridColumn10.MinWidth = 25;
			this.gridColumn10.Name = "gridColumn10";
			this.gridColumn10.Width = 94;
			//
			// gridColumn11
			//
			this.gridColumn11.Caption = "物料名称";
			this.gridColumn11.FieldName = "itemName";
			this.gridColumn11.MinWidth = 25;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 12;
			this.gridColumn11.Width = 94;
			//
			// gridColumn12
			//
			this.gridColumn12.Caption = "车间";
			this.gridColumn12.FieldName = "workShop";
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 13;
			this.gridColumn12.Width = 94;
			//
			// SelectSctk
			//