~tjx/GsMesClient.git

			@@ -89,7 +89,6 @@
			this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
			this.lb_factory = new DevExpress.XtraEditors.LabelControl();
			this.txt_factory = new DevExpress.XtraEditors.TextEdit();
			this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
			this.gcMain = new DevExpress.XtraGrid.GridControl();
			this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
			@@ -111,6 +110,7 @@
			this.lbGuid = new System.Windows.Forms.Label();
			this.txt_itemName = new DevExpress.XtraEditors.MemoEdit();
			this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
			@@ -214,7 +214,7 @@
			this.gv_materialGroup.OptionsColumn.AllowEdit = false;
			this.gv_materialGroup.Tag = "query_a.materialGroup";
			this.gv_materialGroup.Visible = true;
			this.gv_materialGroup.VisibleIndex = 9;
			this.gv_materialGroup.VisibleIndex = 8;
			this.gv_materialGroup.Width = 130;
			//
			// lb_isStatus
			@@ -244,13 +244,14 @@
			this.gv_isStatus.AppearanceCell.Options.UseFont = true;
			this.gv_isStatus.Caption = "禁用状态";
			this.gv_isStatus.FieldName = "fforbidstatus";
			this.gv_isStatus.MaxWidth = 50;
			this.gv_isStatus.MinWidth = 50;
			this.gv_isStatus.Name = "gv_isStatus";
			this.gv_isStatus.OptionsColumn.AllowEdit = false;
			this.gv_isStatus.Tag = "query_a.fforbidstatus";
			this.gv_isStatus.Visible = true;
			this.gv_isStatus.VisibleIndex = 17;
			this.gv_isStatus.Width = 94;
			this.gv_isStatus.VisibleIndex = 16;
			this.gv_isStatus.Width = 50;
			//
			// lb_produceWorkNo
			//
			@@ -305,7 +306,7 @@
			this.gv_bomNo.OptionsColumn.AllowEdit = false;
			this.gv_bomNo.Tag = "query_a.bomNo";
			this.gv_bomNo.Visible = true;
			this.gv_bomNo.VisibleIndex = 8;
			this.gv_bomNo.VisibleIndex = 7;
			this.gv_bomNo.Width = 94;
			//
			// lb_depotNo
			@@ -330,7 +331,7 @@
			this.gv_depotNo.OptionsColumn.AllowEdit = false;
			this.gv_depotNo.Tag = "query_m.depot_name";
			this.gv_depotNo.Visible = true;
			this.gv_depotNo.VisibleIndex = 16;
			this.gv_depotNo.VisibleIndex = 15;
			this.gv_depotNo.Width = 94;
			//
			// lb_subconUnitNo
			@@ -350,13 +351,14 @@
			this.gv_subconUnitNo.AppearanceCell.Options.UseFont = true;
			this.gv_subconUnitNo.Caption = "委外单位";
			this.gv_subconUnitNo.FieldName = "subconUnit";
			this.gv_subconUnitNo.MaxWidth = 50;
			this.gv_subconUnitNo.MinWidth = 50;
			this.gv_subconUnitNo.Name = "gv_subconUnitNo";
			this.gv_subconUnitNo.OptionsColumn.AllowEdit = false;
			this.gv_subconUnitNo.Tag = "query_g.fname";
			this.gv_subconUnitNo.Visible = true;
			this.gv_subconUnitNo.VisibleIndex = 14;
			this.gv_subconUnitNo.Width = 94;
			this.gv_subconUnitNo.VisibleIndex = 13;
			this.gv_subconUnitNo.Width = 50;
			//
			// lb_purchaseUnitNo
			//
			@@ -375,13 +377,14 @@
			this.gv_purchaseUnitNo.AppearanceCell.Options.UseFont = true;
			this.gv_purchaseUnitNo.Caption = "采购单位";
			this.gv_purchaseUnitNo.FieldName = "fpurchaseunitid";
			this.gv_purchaseUnitNo.MaxWidth = 50;
			this.gv_purchaseUnitNo.MinWidth = 50;
			this.gv_purchaseUnitNo.Name = "gv_purchaseUnitNo";
			this.gv_purchaseUnitNo.OptionsColumn.AllowEdit = false;
			this.gv_purchaseUnitNo.Tag = "query_d.fname";
			this.gv_purchaseUnitNo.Visible = true;
			this.gv_purchaseUnitNo.VisibleIndex = 11;
			this.gv_purchaseUnitNo.Width = 94;
			this.gv_purchaseUnitNo.VisibleIndex = 10;
			this.gv_purchaseUnitNo.Width = 50;
			//
			// lb_produceUnitNo
			//
			@@ -400,13 +403,14 @@
			this.gv_produceUnitNo.AppearanceCell.Options.UseFont = true;
			this.gv_produceUnitNo.Caption = "生产单位";
			this.gv_produceUnitNo.FieldName = "produceUnit";
			this.gv_produceUnitNo.MaxWidth = 50;
			this.gv_produceUnitNo.MinWidth = 50;
			this.gv_produceUnitNo.Name = "gv_produceUnitNo";
			this.gv_produceUnitNo.OptionsColumn.AllowEdit = false;
			this.gv_produceUnitNo.Tag = "query_h.fname";
			this.gv_produceUnitNo.Visible = true;
			this.gv_produceUnitNo.VisibleIndex = 15;
			this.gv_produceUnitNo.Width = 94;
			this.gv_produceUnitNo.VisibleIndex = 14;
			this.gv_produceUnitNo.Width = 50;
			//
			// lb_storeUnitNo
			//
			@@ -425,13 +429,14 @@
			this.gv_storeUnitNo.AppearanceCell.Options.UseFont = true;
			this.gv_storeUnitNo.Caption = "库存单位";
			this.gv_storeUnitNo.FieldName = "storeunit";
			this.gv_storeUnitNo.MaxWidth = 50;
			this.gv_storeUnitNo.MinWidth = 50;
			this.gv_storeUnitNo.Name = "gv_storeUnitNo";
			this.gv_storeUnitNo.OptionsColumn.AllowEdit = false;
			this.gv_storeUnitNo.Tag = "query_f.fname";
			this.gv_storeUnitNo.Visible = true;
			this.gv_storeUnitNo.VisibleIndex = 13;
			this.gv_storeUnitNo.Width = 94;
			this.gv_storeUnitNo.VisibleIndex = 12;
			this.gv_storeUnitNo.Width = 50;
			//
			// lb_saleUnitNo
			//
			@@ -450,13 +455,14 @@
			this.gv_saleUnitNo.AppearanceCell.Options.UseFont = true;
			this.gv_saleUnitNo.Caption = "销售单位";
			this.gv_saleUnitNo.FieldName = "saleunit";
			this.gv_saleUnitNo.MaxWidth = 50;
			this.gv_saleUnitNo.MinWidth = 50;
			this.gv_saleUnitNo.Name = "gv_saleUnitNo";
			this.gv_saleUnitNo.OptionsColumn.AllowEdit = false;
			this.gv_saleUnitNo.Tag = "query_e.fname";
			this.gv_saleUnitNo.Visible = true;
			this.gv_saleUnitNo.VisibleIndex = 12;
			this.gv_saleUnitNo.Width = 94;
			this.gv_saleUnitNo.VisibleIndex = 11;
			this.gv_saleUnitNo.Width = 50;
			//
			// lb_orderUnitNo
			//
			@@ -496,13 +502,14 @@
			this.gv_prdPack.AppearanceCell.Options.UseFont = true;
			this.gv_prdPack.Caption = "最小包装数";
			this.gv_prdPack.FieldName = "prdPack";
			this.gv_prdPack.MaxWidth = 50;
			this.gv_prdPack.MinWidth = 50;
			this.gv_prdPack.Name = "gv_prdPack";
			this.gv_prdPack.OptionsColumn.AllowEdit = false;
			this.gv_prdPack.Tag = "query_a.prd_pack";
			this.gv_prdPack.Visible = true;
			this.gv_prdPack.VisibleIndex = 7;
			this.gv_prdPack.Width = 94;
			this.gv_prdPack.VisibleIndex = 6;
			this.gv_prdPack.Width = 50;
			//
			// lb_highLimt
			//
			@@ -531,13 +538,14 @@
			this.gv_highLimt.AppearanceCell.Options.UseFont = true;
			this.gv_highLimt.Caption = "最大库存";
			this.gv_highLimt.FieldName = "highlimit";
			this.gv_highLimt.MaxWidth = 50;
			this.gv_highLimt.MinWidth = 50;
			this.gv_highLimt.Name = "gv_highLimt";
			this.gv_highLimt.OptionsColumn.AllowEdit = false;
			this.gv_highLimt.Tag = "query_a.highLimt";
			this.gv_highLimt.Visible = true;
			this.gv_highLimt.VisibleIndex = 6;
			this.gv_highLimt.Width = 94;
			this.gv_highLimt.VisibleIndex = 5;
			this.gv_highLimt.Width = 50;
			//
			// lb_lowLimt
			//
			@@ -566,13 +574,14 @@
			this.gv_lowLimt.AppearanceCell.Options.UseFont = true;
			this.gv_lowLimt.Caption = "最低库存";
			this.gv_lowLimt.FieldName = "lowlimit";
			this.gv_lowLimt.MaxWidth = 50;
			this.gv_lowLimt.MinWidth = 50;
			this.gv_lowLimt.Name = "gv_lowLimt";
			this.gv_lowLimt.OptionsColumn.AllowEdit = false;
			this.gv_lowLimt.Tag = "query_a.lowlimit";
			this.gv_lowLimt.Visible = true;
			this.gv_lowLimt.VisibleIndex = 5;
			this.gv_lowLimt.Width = 94;
			this.gv_lowLimt.VisibleIndex = 4;
			this.gv_lowLimt.Width = 50;
			//
			// lb_custNO
			//
			@@ -654,13 +663,14 @@
			this.gv_itemUnitNo.AppearanceCell.Options.UseFont = true;
			this.gv_itemUnitNo.Caption = "基本单位";
			this.gv_itemUnitNo.FieldName = "itemUnit";
			this.gv_itemUnitNo.MaxWidth = 50;
			this.gv_itemUnitNo.MinWidth = 50;
			this.gv_itemUnitNo.Name = "gv_itemUnitNo";
			this.gv_itemUnitNo.OptionsColumn.AllowEdit = false;
			this.gv_itemUnitNo.Tag = "query_c.fname";
			this.gv_itemUnitNo.Visible = true;
			this.gv_itemUnitNo.VisibleIndex = 10;
			this.gv_itemUnitNo.Width = 94;
			this.gv_itemUnitNo.VisibleIndex = 9;
			this.gv_itemUnitNo.Width = 50;
			//
			// lb_itemDescription
			//
			@@ -706,7 +716,7 @@
			this.gv_itemModel.OptionsColumn.AllowEdit = false;
			this.gv_itemModel.Tag = "query_a.item_model";
			this.gv_itemModel.Visible = true;
			this.gv_itemModel.VisibleIndex = 4;
			this.gv_itemModel.VisibleIndex = 3;
			this.gv_itemModel.Width = 360;
			//
			// repositoryItemMemoEdit1
			@@ -759,8 +769,8 @@
			this.gv_itemName.OptionsColumn.AllowEdit = false;
			this.gv_itemName.Tag = "query_a.item_name";
			this.gv_itemName.Visible = true;
			this.gv_itemName.VisibleIndex = 3;
			this.gv_itemName.Width = 260;
			this.gv_itemName.VisibleIndex = 2;
			this.gv_itemName.Width = 250;
			//
			// repositoryItemMemoEdit2
			//
			@@ -793,13 +803,13 @@
			this.gv_itemNo.AppearanceCell.Options.UseFont = true;
			this.gv_itemNo.Caption = "物料编码";
			this.gv_itemNo.FieldName = "itemNo";
			this.gv_itemNo.MinWidth = 120;
			this.gv_itemNo.MinWidth = 100;
			this.gv_itemNo.Name = "gv_itemNo";
			this.gv_itemNo.OptionsColumn.AllowEdit = false;
			this.gv_itemNo.Tag = "query_a.item_no";
			this.gv_itemNo.Visible = true;
			this.gv_itemNo.VisibleIndex = 2;
			this.gv_itemNo.Width = 160;
			this.gv_itemNo.VisibleIndex = 1;
			this.gv_itemNo.Width = 120;
			//
			// lb_factory
			//
			@@ -821,22 +831,6 @@
			this.txt_factory.Size = new System.Drawing.Size(150, 28);
			this.txt_factory.TabIndex = 211;
			this.txt_factory.Tag = "factory";
			//
			// gv_id
			//
			this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_id.AppearanceCell.Options.UseFont = true;
			this.gv_id.Caption = "物料ID";
			this.gv_id.FieldName = "id";
			this.gv_id.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
			this.gv_id.MinWidth = 80;
			this.gv_id.Name = "gv_id";
			this.gv_id.OptionsColumn.AllowEdit = false;
			this.gv_id.OptionsColumn.ReadOnly = true;
			this.gv_id.Tag = "query_a.id";
			this.gv_id.Visible = true;
			this.gv_id.VisibleIndex = 1;
			this.gv_id.Width = 94;
			//
			// toolBarMenu1
			//
			@@ -879,7 +873,6 @@
			this.gridView1.ColumnPanelRowHeight = 50;
			this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gridColumn4,
			this.gv_id,
			this.gv_itemNo,
			this.gv_itemName,
			this.gv_itemModel,
			@@ -895,7 +888,8 @@
			this.gv_subconUnitNo,
			this.gv_produceUnitNo,
			this.gv_depotNo,
			this.gv_isStatus});
			this.gv_isStatus,
			this.gridColumn1});
			this.gridView1.GridControl = this.gcMain;
			this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
			this.gridView1.IndicatorWidth = 50;
			@@ -909,7 +903,6 @@
			//
			this.gridColumn4.Caption = "使用组织";
			this.gridColumn4.FieldName = "fSubsidiary";
			this.gridColumn4.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
			this.gridColumn4.MinWidth = 250;
			this.gridColumn4.Name = "gridColumn4";
			this.gridColumn4.OptionsColumn.AllowEdit = false;
			@@ -1124,6 +1117,17 @@
			this.txt_itemModel.TabIndex = 219;
			this.txt_itemModel.Tag = "itemModel";
			//
			// gridColumn1
			//
			this.gridColumn1.Caption = "同步时间";
			this.gridColumn1.FieldName = "lastupdateDate";
			this.gridColumn1.MinWidth = 180;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Tag = "query_a.lastupdate_date";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 17;
			this.gridColumn1.Width = 180;
			//
			// Frm_MesItems
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			@@ -1259,7 +1263,6 @@

			private DevExpress.XtraEditors.LabelControl lb_factory;
			private DevExpress.XtraEditors.TextEdit txt_factory;
			private DevExpress.XtraGrid.Columns.GridColumn gv_id;
			private DevExpress.XtraEditors.MemoEdit txt_itemName;
			private DevExpress.XtraEditors.MemoEdit txt_itemModel;
			private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
			@@ -1273,5 +1276,6 @@
			private UserControl.UcLookUnit txt_saleunit;
			private UserControl.UcLookUnit txt_produceUnit;
			private UserControl.UcLookUnit txt_itemUnit;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
			}
			}