From b94097020bf79e3d5f046ac4fbd3c05efcda30b3 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 03 十二月 2024 15:16:27 +0800 Subject: [PATCH] 删除了用户空间的id --- DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 23 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 1 DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs | 173 ++++++++++++---------------------- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs | 1 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 1 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs | 1 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 1 DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 1 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs | 1 DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs | 22 +--- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 1 DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 3 DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs | 1 DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 1 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 1 DevApp/Gs.DevApp/TestForm/XtraForm1.cs | 1 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 2 DevApp/Gs.DevApp/UserControl/UcLookCk.cs | 21 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 1 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs | 3 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 2 33 files changed, 74 insertions(+), 212 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs index bb43261..5daf99f 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs @@ -223,7 +223,6 @@ // this.txt_itemId.Enabled = false; this.txt_itemId.IsReadly = false; - this.txt_itemId.KeyFile = ""; this.txt_itemId.Location = new System.Drawing.Point(372, 9); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Size = new System.Drawing.Size(266, 33); diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs index f2186ed..f36f7d5 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs @@ -41,7 +41,6 @@ Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; - txt_itemId.KeyFile = "id"; } private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) { diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs index e986fbb..3269df6 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs @@ -1080,7 +1080,6 @@ // txt_depotCode // this.txt_depotCode.IsReadly = false; - this.txt_depotCode.KeyFile = "depotId"; this.txt_depotCode.Location = new System.Drawing.Point(103, 252); this.txt_depotCode.Margin = new System.Windows.Forms.Padding(0); this.txt_depotCode.Name = "txt_depotCode"; diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs index eef8876..7f0da1b 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs @@ -1532,7 +1532,6 @@ // this.txt_suppId.Enabled = false; this.txt_suppId.IsReadly = true; - this.txt_suppId.KeyFile = ""; this.txt_suppId.Location = new System.Drawing.Point(706, 92); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; @@ -1572,7 +1571,6 @@ // this.txt_itemId.Enabled = false; this.txt_itemId.IsReadly = true; - this.txt_itemId.KeyFile = ""; this.txt_itemId.Location = new System.Drawing.Point(97, 48); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Size = new System.Drawing.Size(266, 33); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs index 2520227..d71d3e9 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs @@ -72,8 +72,6 @@ gvMx2.OptionsView.ShowGroupPanel = false; gvMx3.OptionsFind.ShowSearchNavButtons = false; gvMx3.OptionsView.ShowGroupPanel = false; - txt_itemId.KeyFile = "id"; - txt_suppId.KeyFile = "id"; txt_itemId.EditChanged += (s, e) => { txt_itemModel.Text = this.txt_itemId.GetModel(); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs index 954b4e2..2d17891 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs @@ -1506,7 +1506,6 @@ // txt_itemId // this.txt_itemId.IsReadly = true; - this.txt_itemId.KeyFile = ""; this.txt_itemId.Location = new System.Drawing.Point(97, 46); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Size = new System.Drawing.Size(266, 33); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs index 1d8f5aa..aa03801 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs @@ -54,7 +54,6 @@ gvMx2.OptionsView.ShowGroupPanel = false; gvMx3.OptionsFind.ShowSearchNavButtons = false; gvMx3.OptionsView.ShowGroupPanel = false; - txt_itemId.KeyFile = "id"; txt_itemId.EditChanged += (s, e) => { txt_itemModel.Text = this.txt_itemId.GetModel(); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs index 9053684..901b977 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs @@ -562,7 +562,6 @@ // txt_suppId // this.txt_suppId.IsReadly = false; - this.txt_suppId.KeyFile = ""; this.txt_suppId.Location = new System.Drawing.Point(106, 90); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; @@ -572,7 +571,6 @@ // txt_itemId // this.txt_itemId.IsReadly = false; - this.txt_itemId.KeyFile = ""; this.txt_itemId.Location = new System.Drawing.Point(106, 12); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Size = new System.Drawing.Size(239, 33); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs index 2b46c9a..bbd6949 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs @@ -60,8 +60,6 @@ } private void _setIno() { - this.txt_itemId.KeyFile = "id"; - this.txt_suppId.KeyFile = "id"; txt_itemId.EditChanged += (s, e) => { txt_itemNo.Text = this.txt_itemId.GetCode(); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs index 85d55fe..47bdccd 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs @@ -985,7 +985,6 @@ // txt_ItemId // this.txt_ItemId.IsReadly = false; - this.txt_ItemId.KeyFile = ""; this.txt_ItemId.Location = new System.Drawing.Point(85, 14); this.txt_ItemId.Name = "txt_ItemId"; this.txt_ItemId.Size = new System.Drawing.Size(262, 33); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs index dcd0338..42a9f5a 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs @@ -511,7 +511,6 @@ private void _setIno() { - txt_ItemId.KeyFile = "id"; txt_ItemId.EditChanged += (s, e) => { txt_itemModel.Text = this.txt_ItemId.GetModel(); diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs index f7574a6..b1fe01e 100644 --- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs @@ -29,11 +29,11 @@ /// </summary> private void InitializeComponent() { - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); this.gvMx2itemId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2moveOk = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2suppNo = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -79,10 +79,9 @@ this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1qtrkGuid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1ItemOutId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); - this.gvMx1qd001 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit(); this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -94,13 +93,10 @@ this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1qd005 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1qd006 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd007 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd008 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1qd011 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_ts = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_zdNum = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_mtransactionNo = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -158,6 +154,7 @@ this.txt_fromDepotsId = new Gs.DevApp.UserControl.UcLookCk(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); @@ -770,20 +767,17 @@ // this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1guid, - this.gvMx1qtrkGuid, + this.gvMx1ItemOutId, this.gvMxDel, - this.gvMx1qd001, this.gridColumn1, this.gvMx1qd002, this.gvMx1qd003, this.gvMx1qd004, - this.gvMx1qd005, - this.gvMx1qd006, this.gvMx1qd007, this.gvMx1qd008, + this.gridColumn2, this.gvMx1qd009, - this.gvMx1qd010, - this.gvMx1qd011}); + this.gvMx1qd010}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -801,21 +795,21 @@ this.gvMx1guid.Name = "gvMx1guid"; this.gvMx1guid.Tag = "query_a.guid"; this.gvMx1guid.Visible = true; - this.gvMx1guid.VisibleIndex = 1; + this.gvMx1guid.VisibleIndex = 0; this.gvMx1guid.Width = 94; // - // gvMx1qtrkGuid + // gvMx1ItemOutId // - this.gvMx1qtrkGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1qtrkGuid.AppearanceCell.Options.UseFont = true; - this.gvMx1qtrkGuid.Caption = "qtGuid"; - this.gvMx1qtrkGuid.FieldName = "qtGuid"; - this.gvMx1qtrkGuid.MinWidth = 50; - this.gvMx1qtrkGuid.Name = "gvMx1qtrkGuid"; - this.gvMx1qtrkGuid.Tag = "query_a.qtrkGuid"; - this.gvMx1qtrkGuid.Visible = true; - this.gvMx1qtrkGuid.VisibleIndex = 2; - this.gvMx1qtrkGuid.Width = 94; + this.gvMx1ItemOutId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1ItemOutId.AppearanceCell.Options.UseFont = true; + this.gvMx1ItemOutId.Caption = "itemOutId"; + this.gvMx1ItemOutId.FieldName = "itemOutId"; + this.gvMx1ItemOutId.MinWidth = 50; + this.gvMx1ItemOutId.Name = "gvMx1ItemOutId"; + this.gvMx1ItemOutId.Tag = "query_a.qtrkGuid"; + this.gvMx1ItemOutId.Visible = true; + this.gvMx1ItemOutId.VisibleIndex = 1; + this.gvMx1ItemOutId.Width = 94; // // gvMxDel // @@ -824,32 +818,19 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 0; + this.gvMxDel.VisibleIndex = 2; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); - // - // gvMx1qd001 - // - this.gvMx1qd001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1qd001.AppearanceCell.Options.UseFont = true; - this.gvMx1qd001.Caption = "宸ュ崟鍙� "; - this.gvMx1qd001.FieldName = "qd001"; - this.gvMx1qd001.MinWidth = 50; - this.gvMx1qd001.Name = "gvMx1qd001"; - this.gvMx1qd001.Tag = "query_a.qd001"; - this.gvMx1qd001.Visible = true; - this.gvMx1qd001.VisibleIndex = 3; - this.gvMx1qd001.Width = 94; // // gridColumn1 // @@ -859,7 +840,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 4; + this.gridColumn1.VisibleIndex = 3; this.gridColumn1.Width = 94; // // repositoryItemSearchLookUpEdit1 @@ -941,66 +922,40 @@ // this.gvMx1qd002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1qd002.AppearanceCell.Options.UseFont = true; - this.gvMx1qd002.Caption = "鐗╂枡缂栧彿 "; - this.gvMx1qd002.FieldName = "qd002"; + this.gvMx1qd002.Caption = "鐗╂枡缂栧彿"; + this.gvMx1qd002.FieldName = "itemNo"; this.gvMx1qd002.MinWidth = 50; this.gvMx1qd002.Name = "gvMx1qd002"; this.gvMx1qd002.Tag = "query_a.qd002"; this.gvMx1qd002.Visible = true; - this.gvMx1qd002.VisibleIndex = 5; + this.gvMx1qd002.VisibleIndex = 4; this.gvMx1qd002.Width = 94; // // gvMx1qd003 // this.gvMx1qd003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1qd003.AppearanceCell.Options.UseFont = true; - this.gvMx1qd003.Caption = "鐗╂枡鍚嶇О "; - this.gvMx1qd003.FieldName = "qd003"; + this.gvMx1qd003.Caption = "鐗╂枡鍚嶇О"; + this.gvMx1qd003.FieldName = "itemName"; this.gvMx1qd003.MinWidth = 50; this.gvMx1qd003.Name = "gvMx1qd003"; this.gvMx1qd003.Tag = "query_a.qd003"; this.gvMx1qd003.Visible = true; - this.gvMx1qd003.VisibleIndex = 6; + this.gvMx1qd003.VisibleIndex = 5; this.gvMx1qd003.Width = 94; // // gvMx1qd004 // this.gvMx1qd004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1qd004.AppearanceCell.Options.UseFont = true; - this.gvMx1qd004.Caption = "瑙勬牸鍨嬪彿 "; - this.gvMx1qd004.FieldName = "qd004"; + this.gvMx1qd004.Caption = "瑙勬牸鍨嬪彿"; + this.gvMx1qd004.FieldName = "itemModel"; this.gvMx1qd004.MinWidth = 50; this.gvMx1qd004.Name = "gvMx1qd004"; this.gvMx1qd004.Tag = "query_a.qd004"; this.gvMx1qd004.Visible = true; - this.gvMx1qd004.VisibleIndex = 7; + this.gvMx1qd004.VisibleIndex = 6; this.gvMx1qd004.Width = 94; - // - // gvMx1qd005 - // - this.gvMx1qd005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1qd005.AppearanceCell.Options.UseFont = true; - this.gvMx1qd005.Caption = "棰滆壊 "; - this.gvMx1qd005.FieldName = "qd005"; - this.gvMx1qd005.MinWidth = 50; - this.gvMx1qd005.Name = "gvMx1qd005"; - this.gvMx1qd005.Tag = "query_a.qd005"; - this.gvMx1qd005.Visible = true; - this.gvMx1qd005.VisibleIndex = 8; - this.gvMx1qd005.Width = 94; - // - // gvMx1qd006 - // - this.gvMx1qd006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1qd006.AppearanceCell.Options.UseFont = true; - this.gvMx1qd006.Caption = "璁″垝鏁伴噺 "; - this.gvMx1qd006.FieldName = "qd006"; - this.gvMx1qd006.MinWidth = 50; - this.gvMx1qd006.Name = "gvMx1qd006"; - this.gvMx1qd006.Tag = "query_a.qd006"; - this.gvMx1qd006.Visible = true; - this.gvMx1qd006.VisibleIndex = 9; - this.gvMx1qd006.Width = 94; // // gvMx1qd007 // @@ -1010,39 +965,39 @@ this.gvMx1qd007.AppearanceCell.Options.UseForeColor = true; this.gvMx1qd007.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1qd007.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1qd007.Caption = "鐢宠鏁伴噺 "; - this.gvMx1qd007.FieldName = "qd007"; + this.gvMx1qd007.Caption = "鐢宠鏁伴噺"; + this.gvMx1qd007.FieldName = "quantity"; this.gvMx1qd007.MinWidth = 50; this.gvMx1qd007.Name = "gvMx1qd007"; this.gvMx1qd007.Tag = "query_a.qd007"; this.gvMx1qd007.Visible = true; - this.gvMx1qd007.VisibleIndex = 10; + this.gvMx1qd007.VisibleIndex = 7; this.gvMx1qd007.Width = 94; // // gvMx1qd008 // this.gvMx1qd008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1qd008.AppearanceCell.Options.UseFont = true; - this.gvMx1qd008.Caption = "宸插叆鏁伴噺 "; - this.gvMx1qd008.FieldName = "qd008"; + this.gvMx1qd008.Caption = "鍑哄簱鏁伴噺"; + this.gvMx1qd008.FieldName = "quantityCkok"; this.gvMx1qd008.MinWidth = 50; this.gvMx1qd008.Name = "gvMx1qd008"; this.gvMx1qd008.Tag = "query_a.qd008"; this.gvMx1qd008.Visible = true; - this.gvMx1qd008.VisibleIndex = 11; + this.gvMx1qd008.VisibleIndex = 8; this.gvMx1qd008.Width = 94; // // gvMx1qd009 // this.gvMx1qd009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1qd009.AppearanceCell.Options.UseFont = true; - this.gvMx1qd009.Caption = "鍗曚綅 "; - this.gvMx1qd009.FieldName = "qd009"; + this.gvMx1qd009.Caption = "鍗曚綅"; + this.gvMx1qd009.FieldName = "itemUnit"; this.gvMx1qd009.MinWidth = 50; this.gvMx1qd009.Name = "gvMx1qd009"; this.gvMx1qd009.Tag = "query_a.qd009"; this.gvMx1qd009.Visible = true; - this.gvMx1qd009.VisibleIndex = 12; + this.gvMx1qd009.VisibleIndex = 10; this.gvMx1qd009.Width = 94; // // gvMx1qd010 @@ -1053,27 +1008,14 @@ this.gvMx1qd010.AppearanceCell.Options.UseForeColor = true; this.gvMx1qd010.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1qd010.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1qd010.Caption = "澶囨敞 "; - this.gvMx1qd010.FieldName = "qd010"; + this.gvMx1qd010.Caption = "澶囨敞"; + this.gvMx1qd010.FieldName = "remark"; this.gvMx1qd010.MinWidth = 50; this.gvMx1qd010.Name = "gvMx1qd010"; this.gvMx1qd010.Tag = "query_a.qd010"; this.gvMx1qd010.Visible = true; - this.gvMx1qd010.VisibleIndex = 13; + this.gvMx1qd010.VisibleIndex = 11; this.gvMx1qd010.Width = 94; - // - // gvMx1qd011 - // - this.gvMx1qd011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1qd011.AppearanceCell.Options.UseFont = true; - this.gvMx1qd011.Caption = "瀹岀粨鏍囪瘑 "; - this.gvMx1qd011.FieldName = "qd011"; - this.gvMx1qd011.MinWidth = 50; - this.gvMx1qd011.Name = "gvMx1qd011"; - this.gvMx1qd011.Tag = "query_a.qd011"; - this.gvMx1qd011.Visible = true; - this.gvMx1qd011.VisibleIndex = 14; - this.gvMx1qd011.Width = 94; // // gv_ts // @@ -1777,7 +1719,6 @@ // txt_invDepotsId // this.txt_invDepotsId.IsReadly = false; - this.txt_invDepotsId.KeyFile = ""; this.txt_invDepotsId.Location = new System.Drawing.Point(116, 88); this.txt_invDepotsId.Margin = new System.Windows.Forms.Padding(0); this.txt_invDepotsId.Name = "txt_invDepotsId"; @@ -1787,7 +1728,6 @@ // txt_fromDepotsId // this.txt_fromDepotsId.IsReadly = false; - this.txt_fromDepotsId.KeyFile = ""; this.txt_fromDepotsId.Location = new System.Drawing.Point(116, 47); this.txt_fromDepotsId.Margin = new System.Windows.Forms.Padding(0); this.txt_fromDepotsId.Name = "txt_fromDepotsId"; @@ -1810,6 +1750,16 @@ this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; + // + // gridColumn2 + // + this.gridColumn2.Caption = "宸茶皟鎷ㄦ暟閲�"; + this.gridColumn2.FieldName = "quantityOk"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 8; + this.gridColumn2.Width = 94; // // Frm_MesInvItemMoves // @@ -1962,10 +1912,9 @@ private DevExpress.XtraGrid.GridControl gcMx1; private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1qtrkGuid; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1ItemOutId; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd001; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1; private DevExpress.XtraGrid.Views.Grid.GridView gridView2; @@ -1977,12 +1926,10 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd002; private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd003; private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd004; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd005; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd006; private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd007; private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd008; private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd009; private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd010; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd011; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs index ed95aad..62a02cf 100644 --- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs +++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs @@ -17,7 +17,7 @@ { public partial class Frm_MesInvItemMoves : DevExpress.XtraEditors.XtraForm { - string _webServiceName = "User/"; + string _webServiceName = "MesInvItemMovesManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_MesInvItemMoves() { diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs index 214d44e..c3a9562 100644 --- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs @@ -1190,7 +1190,6 @@ // txt_qt008 // this.txt_qt008.IsReadly = false; - this.txt_qt008.KeyFile = ""; this.txt_qt008.Location = new System.Drawing.Point(98, 47); this.txt_qt008.Margin = new System.Windows.Forms.Padding(0); this.txt_qt008.Name = "txt_qt008"; diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs index 4d745e9..cfdc3e8 100644 --- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs +++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs @@ -55,7 +55,6 @@ e.Graphics.DrawString(str, f, Brushes.Gray, r); }; //璁剧疆浠撳簱閫夋嫨 - this.txt_qt008.KeyFile = "depotId"; this.txt_qt008.EditChanged += (s, e) => { diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs index 8b2506c..c4bf800 100644 --- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs @@ -1130,7 +1130,6 @@ // txt_qt018 // this.txt_qt018.IsReadly = false; - this.txt_qt018.KeyFile = ""; this.txt_qt018.Location = new System.Drawing.Point(95, 88); this.txt_qt018.Margin = new System.Windows.Forms.Padding(0); this.txt_qt018.Name = "txt_qt018"; @@ -1140,7 +1139,6 @@ // txt_qt011 // this.txt_qt011.IsReadly = false; - this.txt_qt011.KeyFile = ""; this.txt_qt011.Location = new System.Drawing.Point(425, 51); this.txt_qt011.Margin = new System.Windows.Forms.Padding(0); this.txt_qt011.Name = "txt_qt011"; diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs index c92a191..198909b 100644 --- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs @@ -56,13 +56,11 @@ }; //璁剧疆浠撳簱閫夋嫨 - this.txt_qt011.KeyFile = "depotId"; this.txt_qt011.EditChanged += (s, e) => { }; //璁剧疆渚涘簲鍟嗛�夋嫨 - this.txt_qt018.KeyFile = "id"; this.txt_qt018.EditChanged += (s, e) => { diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs index 04b0b55..51accba 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs @@ -1123,7 +1123,6 @@ // txt_depotsId // this.txt_depotsId.IsReadly = true; - this.txt_depotsId.KeyFile = ""; this.txt_depotsId.Location = new System.Drawing.Point(413, 51); this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0); this.txt_depotsId.Name = "txt_depotsId"; @@ -1143,7 +1142,6 @@ // txt_suppId // this.txt_suppId.IsReadly = true; - this.txt_suppId.KeyFile = ""; this.txt_suppId.Location = new System.Drawing.Point(111, 51); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs index 0975dc7..c31c377 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs @@ -40,13 +40,11 @@ e.Graphics.DrawString(str, f, Brushes.Gray, r); }; //璁剧疆浠撳簱閫夋嫨 - this.txt_depotsId.KeyFile = "depotId"; this.txt_depotsId.EditChanged += (s, e) => { txtDepotsId.Text = this.txt_depotsId.GetId(); }; //璁剧疆渚涘簲鍟嗛�夋嫨 - this.txt_suppId.KeyFile = "id"; this.txt_suppId.EditChanged += (s, e) => { txtSupplierId.Text = this.txt_suppId.GetId(); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs index 37d6a01..ba9129a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs @@ -576,7 +576,6 @@ // txt_suppNo_1 // this.txt_suppNo_1.IsReadly = false; - this.txt_suppNo_1.KeyFile = ""; this.txt_suppNo_1.Location = new System.Drawing.Point(349, 51); this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0); this.txt_suppNo_1.Name = "txt_suppNo_1"; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs index 86a8a65..623a04e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs @@ -42,7 +42,6 @@ e.Graphics.DrawString(str, f, Brushes.Gray, r); }; //璁剧疆渚涘簲鍟嗛�夋嫨 - this.txt_suppNo_1.KeyFile = "id"; this.txt_suppNo_1.EditChanged += (s, e) => { txt_suppId.Text = this.txt_suppNo_1.GetId(); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs index 03a6427..fd80ef3 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs @@ -1171,7 +1171,6 @@ // txt_depotsId // this.txt_depotsId.IsReadly = true; - this.txt_depotsId.KeyFile = ""; 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"; @@ -1200,7 +1199,6 @@ // txt_suppId // this.txt_suppId.IsReadly = true; - this.txt_suppId.KeyFile = ""; 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"; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs index 09166be..1088f1c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs @@ -53,13 +53,11 @@ e.Graphics.DrawString(str, f, Brushes.Gray, r); }; //璁剧疆浠撳簱閫夋嫨 - this.txt_depotsId.KeyFile = "depotId"; this.txt_depotsId.EditChanged += (s, e) => { txtDepotsId.Text = this.txt_depotsId.GetId(); }; //璁剧疆渚涘簲鍟嗛�夋嫨 - this.txt_suppId.KeyFile = "id"; this.txt_suppId.EditChanged += (s, e) => { txtSupplierId.Text = this.txt_suppId.GetId(); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs index b1a1ae5..959f287 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs @@ -1727,7 +1727,6 @@ // txt_suppId // this.txt_suppId.IsReadly = false; - this.txt_suppId.KeyFile = ""; this.txt_suppId.Location = new System.Drawing.Point(100, 57); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; @@ -1737,7 +1736,6 @@ // txt_depotsId // this.txt_depotsId.IsReadly = false; - this.txt_depotsId.KeyFile = ""; this.txt_depotsId.Location = new System.Drawing.Point(100, 97); this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0); this.txt_depotsId.Name = "txt_depotsId"; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs index 14efa46..73f6ae7 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs @@ -39,9 +39,6 @@ Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; - //璁剧疆渚涘簲鍟嗛�夋嫨 - this.txt_suppId.KeyFile = "id"; - this.txt_depotsId.KeyFile = "depotId"; } /// <summary> diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs index f288cf7..cbb84e5 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs @@ -1167,7 +1167,6 @@ // txt_suppId // this.txt_suppId.IsReadly = true; - this.txt_suppId.KeyFile = "id"; this.txt_suppId.Location = new System.Drawing.Point(94, 50); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; @@ -1177,7 +1176,6 @@ // txt_depotId // this.txt_depotId.IsReadly = true; - this.txt_depotId.KeyFile = "depotId"; this.txt_depotId.Location = new System.Drawing.Point(94, 88); this.txt_depotId.Margin = new System.Windows.Forms.Padding(0); this.txt_depotId.Name = "txt_depotId"; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs index 58ab9b5..c02818e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs @@ -1275,7 +1275,6 @@ // txt_supplier // this.txt_supplier.IsReadly = false; - this.txt_supplier.KeyFile = ""; this.txt_supplier.Location = new System.Drawing.Point(385, 13); this.txt_supplier.Margin = new System.Windows.Forms.Padding(0); this.txt_supplier.Name = "txt_supplier"; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs index 2643d27..6a4fe21 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs @@ -40,8 +40,6 @@ e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; - //璁剧疆渚涘簲鍟嗛�夋嫨 - this.txt_supplier.KeyFile = "id"; } /// <summary> diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs index d59af21..e67b665 100644 --- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs +++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs @@ -47,7 +47,6 @@ // ucLookSupplier1 // this.ucLookSupplier1.IsReadly = false; - this.ucLookSupplier1.KeyFile = ""; this.ucLookSupplier1.Location = new System.Drawing.Point(201, 231); this.ucLookSupplier1.Margin = new System.Windows.Forms.Padding(0); this.ucLookSupplier1.Name = "ucLookSupplier1"; @@ -57,7 +56,6 @@ // ucLookItems1 // this.ucLookItems1.IsReadly = false; - this.ucLookItems1.KeyFile = ""; this.ucLookItems1.Location = new System.Drawing.Point(187, 119); this.ucLookItems1.Name = "ucLookItems1"; this.ucLookItems1.Size = new System.Drawing.Size(266, 33); @@ -67,7 +65,6 @@ // txt_ItemId // this.txt_ItemId.IsReadly = false; - this.txt_ItemId.KeyFile = ""; this.txt_ItemId.Location = new System.Drawing.Point(187, 54); this.txt_ItemId.Margin = new System.Windows.Forms.Padding(0); this.txt_ItemId.Name = "txt_ItemId"; diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs index 3ec4fb8..2a0a628 100644 --- a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs +++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs @@ -25,7 +25,6 @@ public XtraForm1() { InitializeComponent(); - txt_ItemId.KeyFile = "id"; } diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs index cea9eca..be8a342 100644 --- a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs +++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs @@ -15,19 +15,10 @@ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨"; lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged; - + getSuppler(); } public bool IsReadly { get; set; } - private string _KeyFile = ""; - public string KeyFile - { - get { return _KeyFile; } - set - { - _KeyFile = value; - getSuppler(); - } - } + /// <summary> /// 鏀瑰彉浜嬩欢 /// </summary> @@ -52,8 +43,7 @@ var dt = rtn.rtnData.list; lookSearchSupplier.Properties.DataSource = dt; lookSearchSupplier.Properties.DisplayMember = "depotName"; - // lookSearchSupplier.Properties.ValueMember = "depotId"; - lookSearchSupplier.Properties.ValueMember = KeyFile; + lookSearchSupplier.Properties.ValueMember = "depotId"; } catch (Exception ex) { @@ -94,10 +84,7 @@ lookSearchSupplier.EditValue = null; return; } - if (KeyFile.ToUpper() == "depotId".ToUpper()) - lookSearchSupplier.EditValue =Int64.Parse( ((Code.ToString().Trim()))); - else - lookSearchSupplier.EditValue = ((Code.ToString().Trim())); + lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim()))); } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs index 8cac2ee..56e41c5 100644 --- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs +++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs @@ -22,20 +22,10 @@ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨"; lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged; + getSuppler(); } public bool IsReadly { get; set; } - private string _KeyFile = ""; - public string KeyFile - { - get { return _KeyFile; } - set - { - _KeyFile = value; - if (!string.IsNullOrEmpty(_KeyFile)) - getSuppler(); - } - } /// <summary> /// 鏀瑰彉浜嬩欢 /// </summary> @@ -65,8 +55,8 @@ var dt = rtn.rtnData.list; lookSearchSupplier.Properties.DataSource = dt; lookSearchSupplier.Properties.DisplayMember = "itemName"; - // lookSearchSupplier.Properties.ValueMember = "depotId"; - lookSearchSupplier.Properties.ValueMember = KeyFile; + lookSearchSupplier.Properties.ValueMember = "id"; + } catch (Exception ex) { @@ -116,12 +106,7 @@ lookSearchSupplier.EditValue = null; return; } - if (KeyFile == "id") - { - lookSearchSupplier.EditValue =((Code.ToString().Trim())); - } - else - lookSearchSupplier.EditValue = ((Code.ToString().Trim())); + lookSearchSupplier.EditValue = ((Code.ToString().Trim())); } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs index 5e0a7de..dddbe4d 100644 --- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs +++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs @@ -17,19 +17,10 @@ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨"; lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged; + getSuppler(); } public bool IsReadly { get; set; } - private string _KeyFile = ""; - public string KeyFile - { - get { return _KeyFile; } - set - { - _KeyFile = value; - if(!string.IsNullOrEmpty(value)) - getSuppler(); - } - } + /// <summary> /// 鏀瑰彉浜嬩欢 /// </summary> @@ -59,8 +50,8 @@ var dt = rtn.rtnData.list; lookSearchSupplier.Properties.DataSource = dt; lookSearchSupplier.Properties.DisplayMember = "suppName"; - // lookSearchSupplier.Properties.ValueMember = "suppNo"; - lookSearchSupplier.Properties.ValueMember = KeyFile; + lookSearchSupplier.Properties.ValueMember = "id"; + } catch (Exception ex) { @@ -101,10 +92,7 @@ lookSearchSupplier.EditValue = null; return; } - if (KeyFile == "id") - lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim())); - else - lookSearchSupplier.EditValue = ((Code.ToString().Trim())); + lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim())); } } } \ No newline at end of file -- Gitblit v1.9.3