~tjx/GsMesClient.git

			@@ -118,7 +118,7 @@
			this.txtSupplierId = new DevExpress.XtraEditors.TextEdit();
			this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
			this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
			this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit();
			this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
			this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
			this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
			this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
			@@ -148,7 +148,7 @@
			((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
			this.SuspendLayout();
			//
			@@ -287,7 +287,6 @@
			this.gvMx1urgentFlag.FieldName = "urgentFlag";
			this.gvMx1urgentFlag.MinWidth = 60;
			this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
			this.gvMx1urgentFlag.OptionsColumn.ReadOnly = true;
			this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
			this.gvMx1urgentFlag.Visible = true;
			this.gvMx1urgentFlag.VisibleIndex = 5;
			@@ -753,6 +752,7 @@
			this.gridColumn2.Caption = "入库";
			this.gridColumn2.FieldName = "status";
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.OptionsColumn.AllowEdit = false;
			this.gridColumn2.Visible = true;
			this.gridColumn2.Width = 50;
			//
			@@ -878,6 +878,7 @@
			this.gridColumn4.Caption = "收货仓库名称";
			this.gridColumn4.FieldName = "depotName";
			this.gridColumn4.Name = "gridColumn4";
			this.gridColumn4.OptionsColumn.AllowEdit = false;
			this.gridColumn4.Visible = true;
			this.gridColumn4.Width = 119;
			//
			@@ -928,6 +929,7 @@
			this.gridColumn5.Caption = "供应商名称";
			this.gridColumn5.FieldName = "suppName";
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.OptionsColumn.AllowEdit = false;
			this.gridColumn5.Visible = true;
			this.gridColumn5.Width = 49;
			//
			@@ -1034,7 +1036,6 @@
			this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
			this.pageBar1.Name = "pageBar1";
			this.pageBar1.RecordCount = 0;
			this.pageBar1.RowsCount = 50;
			this.pageBar1.Size = new System.Drawing.Size(1231, 39);
			this.pageBar1.TabIndex = 3;
			this.pageBar1.TotalPages = 0;
			@@ -1069,7 +1070,7 @@
			this.panel1.Controls.Add(this.txtSupplierId);
			this.panel1.Controls.Add(this.txt_fType);
			this.panel1.Controls.Add(this.txt_urgentFlag);
			this.panel1.Controls.Add(this.txt_ischeck);
			this.panel1.Controls.Add(this.txt_fstatus);
			this.panel1.Controls.Add(this.txt_depotsId);
			this.panel1.Controls.Add(this.labelControl3);
			this.panel1.Controls.Add(this.btnSelect);
			@@ -1157,18 +1158,18 @@
			this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
			this.txt_urgentFlag.TabIndex = 449;
			//
			// txt_ischeck
			// txt_fstatus
			//
			this.txt_ischeck.Enabled = false;
			this.txt_ischeck.Location = new System.Drawing.Point(785, 92);
			this.txt_ischeck.Name = "txt_ischeck";
			this.txt_ischeck.Properties.Caption = "";
			this.txt_ischeck.Size = new System.Drawing.Size(47, 24);
			this.txt_ischeck.TabIndex = 447;
			this.txt_fstatus.Enabled = false;
			this.txt_fstatus.Location = new System.Drawing.Point(785, 92);
			this.txt_fstatus.Name = "txt_fstatus";
			this.txt_fstatus.Properties.Caption = "";
			this.txt_fstatus.Size = new System.Drawing.Size(47, 24);
			this.txt_fstatus.TabIndex = 447;
			//
			// txt_depotsId
			//
			this.txt_depotsId.KeyFile = "";
			this.txt_depotsId.IsReadly = true;
			this.txt_depotsId.Location = new System.Drawing.Point(421, 50);
			this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
			this.txt_depotsId.Name = "txt_depotsId";
			@@ -1196,7 +1197,7 @@
			//
			// txt_suppId
			//
			this.txt_suppId.KeyFile = "";
			this.txt_suppId.IsReadly = true;
			this.txt_suppId.Location = new System.Drawing.Point(98, 50);
			this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
			this.txt_suppId.Name = "txt_suppId";
			@@ -1280,7 +1281,7 @@
			((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
			this.ResumeLayout(false);

			@@ -1337,7 +1338,7 @@
			private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
			private DevExpress.XtraEditors.LabelControl lb_remark;
			private DevExpress.XtraEditors.TextEdit txt_remark;
			private DevExpress.XtraEditors.CheckEdit txt_ischeck;
			private DevExpress.XtraEditors.CheckEdit txt_fstatus;
			private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
			private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;