~tjx/GsMesClient.git

			@@ -136,10 +136,10 @@
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			@@ -206,6 +206,7 @@
			//
			this.toolBarMenu1.chkParameter = "0,0,0,0,000prc_cgdhd_submit";
			this.toolBarMenu1.currentAction = null;
			this.toolBarMenu1.defaultActions = null;
			this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
			this.toolBarMenu1.guidKey = null;
			this.toolBarMenu1.isSetBtn = false;
			@@ -686,7 +687,9 @@
			//
			this.txt_createBy.Location = new System.Drawing.Point(708, 12);
			this.txt_createBy.Name = "txt_createBy";
			this.txt_createBy.Size = new System.Drawing.Size(191, 24);
			this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_createBy.Properties.Appearance.Options.UseFont = true;
			this.txt_createBy.Size = new System.Drawing.Size(191, 28);
			this.txt_createBy.StyleController = this.layoutMx1;
			this.txt_createBy.TabIndex = 461;
			this.txt_createBy.Tag = "readOnly";
			@@ -695,7 +698,9 @@
			//
			this.txt_createDate.Location = new System.Drawing.Point(708, 44);
			this.txt_createDate.Name = "txt_createDate";
			this.txt_createDate.Size = new System.Drawing.Size(191, 24);
			this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_createDate.Properties.Appearance.Options.UseFont = true;
			this.txt_createDate.Size = new System.Drawing.Size(191, 28);
			this.txt_createDate.StyleController = this.layoutMx1;
			this.txt_createDate.TabIndex = 462;
			this.txt_createDate.Tag = "readOnly";
			@@ -704,7 +709,9 @@
			//
			this.txt_checkUser.Location = new System.Drawing.Point(1005, 12);
			this.txt_checkUser.Name = "txt_checkUser";
			this.txt_checkUser.Size = new System.Drawing.Size(193, 24);
			this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
			this.txt_checkUser.Size = new System.Drawing.Size(193, 28);
			this.txt_checkUser.StyleController = this.layoutMx1;
			this.txt_checkUser.TabIndex = 463;
			this.txt_checkUser.Tag = "readOnly";
			@@ -713,7 +720,9 @@
			//
			this.txt_checkDate.Location = new System.Drawing.Point(1005, 44);
			this.txt_checkDate.Name = "txt_checkDate";
			this.txt_checkDate.Size = new System.Drawing.Size(193, 24);
			this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
			this.txt_checkDate.Size = new System.Drawing.Size(193, 28);
			this.txt_checkDate.StyleController = this.layoutMx1;
			this.txt_checkDate.TabIndex = 464;
			this.txt_checkDate.Tag = "readOnly";
			@@ -722,7 +731,9 @@
			//
			this.txt_paperBillNo.Location = new System.Drawing.Point(708, 76);
			this.txt_paperBillNo.Name = "txt_paperBillNo";
			this.txt_paperBillNo.Size = new System.Drawing.Size(191, 24);
			this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
			this.txt_paperBillNo.Size = new System.Drawing.Size(191, 28);
			this.txt_paperBillNo.StyleController = this.layoutMx1;
			this.txt_paperBillNo.TabIndex = 465;
			//
			@@ -1341,6 +1352,26 @@
			this.gridColumn10.VisibleIndex = 16;
			this.gridColumn10.Width = 94;
			//
			// gridColumn12
			//
			this.gridColumn12.Caption = "退l料时间";
			this.gridColumn12.FieldName = "returnDate";
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 17;
			this.gridColumn12.Width = 94;
			//
			// gridColumn13
			//
			this.gridColumn13.Caption = "退料人";
			this.gridColumn13.FieldName = "returnBy";
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 18;
			this.gridColumn13.Width = 94;
			//
			// gvBtnAlawys
			//
			this.gvBtnAlawys.Caption = "退料";
			@@ -1361,26 +1392,6 @@
			this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
			this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
			this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
			//
			// gridColumn12
			//
			this.gridColumn12.Caption = "退l料时间";
			this.gridColumn12.FieldName = "returnDate";
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 17;
			this.gridColumn12.Width = 94;
			//
			// gridColumn13
			//
			this.gridColumn13.Caption = "退料人";
			this.gridColumn13.FieldName = "returnBy";
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 18;
			this.gridColumn13.Width = 94;
			//
			// gvMxDel
			//