~tjx/GsMesClient.git

			@@ -122,6 +122,7 @@
			this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
			this.gcMain = new DevExpress.XtraGrid.GridControl();
			this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			@@ -483,14 +484,14 @@
			//
			this.gv_materialProperti.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_materialProperti.AppearanceCell.Options.UseFont = true;
			this.gv_materialProperti.Caption = "物料属性 ";
			this.gv_materialProperti.Caption = "物料属性";
			this.gv_materialProperti.FieldName = "materialProperti";
			this.gv_materialProperti.MinWidth = 50;
			this.gv_materialProperti.Name = "gv_materialProperti";
			this.gv_materialProperti.OptionsColumn.AllowEdit = false;
			this.gv_materialProperti.Tag = "query_a.material_properti";
			this.gv_materialProperti.Visible = true;
			this.gv_materialProperti.VisibleIndex = 15;
			this.gv_materialProperti.VisibleIndex = 16;
			this.gv_materialProperti.Width = 94;
			//
			// lb_productionWorkshop
			@@ -516,14 +517,14 @@
			//
			this.gv_productionWorkshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_productionWorkshop.AppearanceCell.Options.UseFont = true;
			this.gv_productionWorkshop.Caption = "生产车间 ";
			this.gv_productionWorkshop.Caption = "生产车间";
			this.gv_productionWorkshop.FieldName = "productionWorkshop";
			this.gv_productionWorkshop.MinWidth = 50;
			this.gv_productionWorkshop.Name = "gv_productionWorkshop";
			this.gv_productionWorkshop.OptionsColumn.AllowEdit = false;
			this.gv_productionWorkshop.Tag = "query_a.production_workshop";
			this.gv_productionWorkshop.Visible = true;
			this.gv_productionWorkshop.VisibleIndex = 14;
			this.gv_productionWorkshop.VisibleIndex = 15;
			this.gv_productionWorkshop.Width = 94;
			//
			// lb_isFkc
			@@ -549,14 +550,14 @@
			//
			this.gv_isFkc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_isFkc.AppearanceCell.Options.UseFont = true;
			this.gv_isFkc.Caption = "允许即时库存负库存 ";
			this.gv_isFkc.Caption = "允许即时库存负库存";
			this.gv_isFkc.FieldName = "isFkc";
			this.gv_isFkc.MinWidth = 50;
			this.gv_isFkc.Name = "gv_isFkc";
			this.gv_isFkc.OptionsColumn.AllowEdit = false;
			this.gv_isFkc.Tag = "query_a.is_fkc";
			this.gv_isFkc.Visible = true;
			this.gv_isFkc.VisibleIndex = 13;
			this.gv_isFkc.VisibleIndex = 14;
			this.gv_isFkc.Width = 94;
			//
			// lb_zuid
			@@ -582,14 +583,14 @@
			//
			this.gv_zuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_zuid.AppearanceCell.Options.UseFont = true;
			this.gv_zuid.Caption = "分组 ";
			this.gv_zuid.Caption = "分组";
			this.gv_zuid.FieldName = "zuid";
			this.gv_zuid.MinWidth = 50;
			this.gv_zuid.Name = "gv_zuid";
			this.gv_zuid.OptionsColumn.AllowEdit = false;
			this.gv_zuid.Tag = "query_a.zuid";
			this.gv_zuid.Visible = true;
			this.gv_zuid.VisibleIndex = 12;
			this.gv_zuid.VisibleIndex = 13;
			this.gv_zuid.Width = 94;
			//
			// lb_piType
			@@ -653,14 +654,14 @@
			//
			this.gv_isNg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_isNg.AppearanceCell.Options.UseFont = true;
			this.gv_isNg.Caption = "是否不良品仓 ";
			this.gv_isNg.Caption = "是否不良品仓";
			this.gv_isNg.FieldName = "isNg";
			this.gv_isNg.MinWidth = 50;
			this.gv_isNg.Name = "gv_isNg";
			this.gv_isNg.OptionsColumn.AllowEdit = false;
			this.gv_isNg.Tag = "query_a.is_ng";
			this.gv_isNg.Visible = true;
			this.gv_isNg.VisibleIndex = 11;
			this.gv_isNg.VisibleIndex = 12;
			this.gv_isNg.Width = 94;
			//
			// lb_isWy
			@@ -686,14 +687,14 @@
			//
			this.gv_isWy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_isWy.AppearanceCell.Options.UseFont = true;
			this.gv_isWy.Caption = "是否委外仓库 ";
			this.gv_isWy.Caption = "是否委外仓库";
			this.gv_isWy.FieldName = "isWy";
			this.gv_isWy.MinWidth = 50;
			this.gv_isWy.Name = "gv_isWy";
			this.gv_isWy.OptionsColumn.AllowEdit = false;
			this.gv_isWy.Tag = "query_a.is_wy";
			this.gv_isWy.Visible = true;
			this.gv_isWy.VisibleIndex = 10;
			this.gv_isWy.VisibleIndex = 11;
			this.gv_isWy.Width = 94;
			//
			// lb_iconType
			@@ -757,14 +758,14 @@
			//
			this.gv_depottypecode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_depottypecode.AppearanceCell.Options.UseFont = true;
			this.gv_depottypecode.Caption = "仓库类型编码 ";
			this.gv_depottypecode.Caption = "仓库类型编码";
			this.gv_depottypecode.FieldName = "depottypecode";
			this.gv_depottypecode.MinWidth = 50;
			this.gv_depottypecode.Name = "gv_depottypecode";
			this.gv_depottypecode.OptionsColumn.AllowEdit = false;
			this.gv_depottypecode.Tag = "query_a.depottypecode";
			this.gv_depottypecode.Visible = true;
			this.gv_depottypecode.VisibleIndex = 9;
			this.gv_depottypecode.VisibleIndex = 10;
			this.gv_depottypecode.Width = 94;
			//
			// lb_type2
			@@ -790,14 +791,14 @@
			//
			this.gv_type2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_type2.AppearanceCell.Options.UseFont = true;
			this.gv_type2.Caption = "成品使用 ";
			this.gv_type2.Caption = "成品使用";
			this.gv_type2.FieldName = "type2";
			this.gv_type2.MinWidth = 50;
			this.gv_type2.Name = "gv_type2";
			this.gv_type2.OptionsColumn.AllowEdit = false;
			this.gv_type2.Tag = "query_a.type_2";
			this.gv_type2.Visible = true;
			this.gv_type2.VisibleIndex = 8;
			this.gv_type2.VisibleIndex = 9;
			this.gv_type2.Width = 94;
			//
			// lb_type1
			@@ -823,14 +824,14 @@
			//
			this.gv_type1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_type1.AppearanceCell.Options.UseFont = true;
			this.gv_type1.Caption = "物料使用 ";
			this.gv_type1.Caption = "物料使用";
			this.gv_type1.FieldName = "type1";
			this.gv_type1.MinWidth = 50;
			this.gv_type1.Name = "gv_type1";
			this.gv_type1.OptionsColumn.AllowEdit = false;
			this.gv_type1.Tag = "query_a.type_1";
			this.gv_type1.Visible = true;
			this.gv_type1.VisibleIndex = 7;
			this.gv_type1.VisibleIndex = 8;
			this.gv_type1.Width = 94;
			//
			// lb_factory
			@@ -875,14 +876,14 @@
			//
			this.gv_depottype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_depottype.AppearanceCell.Options.UseFont = true;
			this.gv_depottype.Caption = "仓库类型 ";
			this.gv_depottype.Caption = "仓库类型";
			this.gv_depottype.FieldName = "depottype";
			this.gv_depottype.MinWidth = 50;
			this.gv_depottype.Name = "gv_depottype";
			this.gv_depottype.OptionsColumn.AllowEdit = false;
			this.gv_depottype.Tag = "query_a.depottype";
			this.gv_depottype.Visible = true;
			this.gv_depottype.VisibleIndex = 6;
			this.gv_depottype.VisibleIndex = 7;
			this.gv_depottype.Width = 94;
			//
			// lb_lastupdateDate
			@@ -908,15 +909,15 @@
			//
			this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
			this.gv_lastupdateDate.Caption = "最后更新时间 ";
			this.gv_lastupdateDate.Caption = "最后更新时间";
			this.gv_lastupdateDate.FieldName = "lastupdateDate";
			this.gv_lastupdateDate.MinWidth = 50;
			this.gv_lastupdateDate.MinWidth = 200;
			this.gv_lastupdateDate.Name = "gv_lastupdateDate";
			this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
			this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
			this.gv_lastupdateDate.Visible = true;
			this.gv_lastupdateDate.VisibleIndex = 5;
			this.gv_lastupdateDate.Width = 94;
			this.gv_lastupdateDate.VisibleIndex = 6;
			this.gv_lastupdateDate.Width = 200;
			//
			// lb_lastupdateBy
			//
			@@ -941,14 +942,14 @@
			//
			this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
			this.gv_lastupdateBy.Caption = "最后更新人 ";
			this.gv_lastupdateBy.Caption = "最后更新人";
			this.gv_lastupdateBy.FieldName = "lastupdateBy";
			this.gv_lastupdateBy.MinWidth = 50;
			this.gv_lastupdateBy.Name = "gv_lastupdateBy";
			this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
			this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
			this.gv_lastupdateBy.Visible = true;
			this.gv_lastupdateBy.VisibleIndex = 4;
			this.gv_lastupdateBy.VisibleIndex = 5;
			this.gv_lastupdateBy.Width = 94;
			//
			// lb_createDate
			@@ -993,14 +994,14 @@
			//
			this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_createBy.AppearanceCell.Options.UseFont = true;
			this.gv_createBy.Caption = "仓库负责人 ";
			this.gv_createBy.Caption = "仓库负责人";
			this.gv_createBy.FieldName = "createBy";
			this.gv_createBy.MinWidth = 50;
			this.gv_createBy.Name = "gv_createBy";
			this.gv_createBy.OptionsColumn.AllowEdit = false;
			this.gv_createBy.Tag = "query_a.create_by";
			this.gv_createBy.Visible = true;
			this.gv_createBy.VisibleIndex = 3;
			this.gv_createBy.VisibleIndex = 4;
			this.gv_createBy.Width = 94;
			//
			// lb_description
			@@ -1026,14 +1027,14 @@
			//
			this.gv_description.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_description.AppearanceCell.Options.UseFont = true;
			this.gv_description.Caption = "备注 ";
			this.gv_description.Caption = "备注";
			this.gv_description.FieldName = "description";
			this.gv_description.MinWidth = 50;
			this.gv_description.Name = "gv_description";
			this.gv_description.OptionsColumn.AllowEdit = false;
			this.gv_description.Tag = "query_a.description";
			this.gv_description.Visible = true;
			this.gv_description.VisibleIndex = 2;
			this.gv_description.VisibleIndex = 3;
			this.gv_description.Width = 94;
			//
			// lb_depotName
			@@ -1059,15 +1060,15 @@
			//
			this.gv_depotName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_depotName.AppearanceCell.Options.UseFont = true;
			this.gv_depotName.Caption = "仓库名称 ";
			this.gv_depotName.Caption = "仓库名称";
			this.gv_depotName.FieldName = "depotName";
			this.gv_depotName.MinWidth = 50;
			this.gv_depotName.MinWidth = 100;
			this.gv_depotName.Name = "gv_depotName";
			this.gv_depotName.OptionsColumn.AllowEdit = false;
			this.gv_depotName.Tag = "query_a.depot_name";
			this.gv_depotName.Visible = true;
			this.gv_depotName.VisibleIndex = 1;
			this.gv_depotName.Width = 94;
			this.gv_depotName.VisibleIndex = 2;
			this.gv_depotName.Width = 100;
			//
			// lb_depotCode
			//
			@@ -1092,15 +1093,15 @@
			//
			this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_depotCode.AppearanceCell.Options.UseFont = true;
			this.gv_depotCode.Caption = "仓库编码 ";
			this.gv_depotCode.Caption = "仓库编码";
			this.gv_depotCode.FieldName = "depotCode";
			this.gv_depotCode.MinWidth = 50;
			this.gv_depotCode.MinWidth = 100;
			this.gv_depotCode.Name = "gv_depotCode";
			this.gv_depotCode.OptionsColumn.AllowEdit = false;
			this.gv_depotCode.Tag = "query_a.depot_code";
			this.gv_depotCode.Visible = true;
			this.gv_depotCode.VisibleIndex = 0;
			this.gv_depotCode.Width = 94;
			this.gv_depotCode.VisibleIndex = 1;
			this.gv_depotCode.Width = 100;
			//
			// toolBarMenu1
			//
			@@ -1133,6 +1134,7 @@
			this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gridView1.Appearance.Row.Options.UseFont = true;
			this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gv_id,
			this.gv_depotCode,
			this.gv_depotName,
			this.gv_depottype,
			@@ -1155,6 +1157,16 @@
			this.gridView1.OptionsFind.ShowSearchNavButtons = false;
			this.gridView1.OptionsView.ShowAutoFilterRow = true;
			this.gridView1.OptionsView.ShowGroupPanel = false;
			//
			// gv_id
			//
			this.gv_id.Caption = "gridColumn1";
			this.gv_id.FieldName = "depotId";
			this.gv_id.MinWidth = 25;
			this.gv_id.Name = "gv_id";
			this.gv_id.Visible = true;
			this.gv_id.VisibleIndex = 0;
			this.gv_id.Width = 94;
			//
			// xtraTabControl1
			//
			@@ -1469,5 +1481,6 @@
			private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
			private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
			private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
			private DevExpress.XtraGrid.Columns.GridColumn gv_id;
			}
			}