From 096d3847e5a4cdd0cbc0abee366b3a3470b92e61 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 05 四月 2025 20:39:06 +0800 Subject: [PATCH] fqc --- /dev/null | 81 ------ DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.resx | 0 DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs | 205 +++++++++++++++ DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs | 102 +++++++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 10 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 163 +++++++----- DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 157 ++++++++++-- DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 1 9 files changed, 543 insertions(+), 178 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.Designer.cs index f787da4..5179d5f 100644 --- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.Designer.cs @@ -28,6 +28,8 @@ /// </summary> private void InitializeComponent() { + // this.jyxm1 = new QC.Jyxm("fqc"); + this.jyxm1 = new QC.Jyxm("fqc"); this.SuspendLayout(); // // jyxm1 diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs index c79e3a7..2caa88f 100644 --- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs @@ -110,11 +110,11 @@ this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit(); this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit(); this.txt_fcheckDate = new DevExpress.XtraEditors.TextEdit(); - this.txt_logNo1 = new DevExpress.XtraEditors.TextEdit(); + this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit(); this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); this.txt_itemModel = new DevExpress.XtraEditors.TextEdit(); this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit(); - this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit(); + this.txt_checkQty = new DevExpress.XtraEditors.TextEdit(); this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit(); this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit(); this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit(); @@ -128,6 +128,7 @@ this.txt_epTag = new DevExpress.XtraEditors.ComboBoxEdit(); this.textEdit1 = new DevExpress.XtraEditors.TextEdit(); this.textEdit2 = new DevExpress.XtraEditors.TextEdit(); + this.txt_itemName = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -150,16 +151,17 @@ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -258,11 +260,11 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_logNo1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit(); @@ -276,6 +278,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); @@ -298,16 +301,17 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -858,11 +862,11 @@ this.layoutMx1.Controls.Add(this.txt_fcheckResu); this.layoutMx1.Controls.Add(this.txt_releaseNo); this.layoutMx1.Controls.Add(this.txt_fcheckDate); - this.layoutMx1.Controls.Add(this.txt_logNo1); + this.layoutMx1.Controls.Add(this.txt_lotNo1); this.layoutMx1.Controls.Add(this.txt_itemNo); this.layoutMx1.Controls.Add(this.txt_itemModel); this.layoutMx1.Controls.Add(this.txt_fcheckBy); - this.layoutMx1.Controls.Add(this.txt_fbatchQty); + this.layoutMx1.Controls.Add(this.txt_checkQty); this.layoutMx1.Controls.Add(this.txt_fsubmitBy); this.layoutMx1.Controls.Add(this.txt_fsubmitDate); this.layoutMx1.Controls.Add(this.txt_fsubmit); @@ -876,6 +880,7 @@ this.layoutMx1.Controls.Add(this.txt_epTag); this.layoutMx1.Controls.Add(this.textEdit1); this.layoutMx1.Controls.Add(this.textEdit2); + this.layoutMx1.Controls.Add(this.txt_itemName); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem17, @@ -883,7 +888,7 @@ this.layoutControlItem21}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(817, 530, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(813, 589, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(1342, 282); this.layoutMx1.TabIndex = 0; @@ -895,6 +900,7 @@ this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txt_itemId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_itemId.Size = new System.Drawing.Size(254, 24); this.txt_itemId.StyleController = this.layoutMx1; this.txt_itemId.TabIndex = 824; @@ -1001,16 +1007,16 @@ this.txt_fcheckDate.TabIndex = 216; this.txt_fcheckDate.Tag = "readonly"; // - // txt_logNo1 + // txt_lotNo1 // - this.txt_logNo1.Location = new System.Drawing.Point(744, 76); - this.txt_logNo1.Name = "txt_logNo1"; - this.txt_logNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_logNo1.Properties.Appearance.Options.UseFont = true; - this.txt_logNo1.Size = new System.Drawing.Size(254, 28); - this.txt_logNo1.StyleController = this.layoutMx1; - this.txt_logNo1.TabIndex = 262; - this.txt_logNo1.Tag = "readonly"; + this.txt_lotNo1.Location = new System.Drawing.Point(744, 76); + this.txt_lotNo1.Name = "txt_lotNo1"; + this.txt_lotNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_lotNo1.Properties.Appearance.Options.UseFont = true; + this.txt_lotNo1.Size = new System.Drawing.Size(254, 28); + this.txt_lotNo1.StyleController = this.layoutMx1; + this.txt_lotNo1.TabIndex = 262; + this.txt_lotNo1.Tag = ""; // // txt_itemNo // @@ -1025,7 +1031,7 @@ // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(84, 175); + this.txt_itemModel.Location = new System.Drawing.Point(84, 208); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Size = new System.Drawing.Size(254, 24); this.txt_itemModel.StyleController = this.layoutMx1; @@ -1043,16 +1049,16 @@ this.txt_fcheckBy.TabIndex = 217; this.txt_fcheckBy.Tag = "readonly"; // - // txt_fbatchQty + // txt_checkQty // - this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12); - this.txt_fbatchQty.Name = "txt_fbatchQty"; - this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true; - this.txt_fbatchQty.Size = new System.Drawing.Size(254, 28); - this.txt_fbatchQty.StyleController = this.layoutMx1; - this.txt_fbatchQty.TabIndex = 222; - this.txt_fbatchQty.Tag = ""; + this.txt_checkQty.Location = new System.Drawing.Point(414, 12); + this.txt_checkQty.Name = "txt_checkQty"; + this.txt_checkQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_checkQty.Properties.Appearance.Options.UseFont = true; + this.txt_checkQty.Size = new System.Drawing.Size(254, 28); + this.txt_checkQty.StyleController = this.layoutMx1; + this.txt_checkQty.TabIndex = 222; + this.txt_checkQty.Tag = ""; // // txt_fsubmitBy // @@ -1125,9 +1131,9 @@ // // txt_lotNo // - this.txt_lotNo.Location = new System.Drawing.Point(84, 208); + this.txt_lotNo.Location = new System.Drawing.Point(1074, 241); this.txt_lotNo.Name = "txt_lotNo"; - this.txt_lotNo.Size = new System.Drawing.Size(254, 24); + this.txt_lotNo.Size = new System.Drawing.Size(256, 24); this.txt_lotNo.StyleController = this.layoutMx1; this.txt_lotNo.TabIndex = 815; this.txt_lotNo.Tag = "readonly"; @@ -1176,6 +1182,15 @@ this.textEdit2.StyleController = this.layoutMx1; this.textEdit2.TabIndex = 823; this.textEdit2.Tag = "readonly"; + // + // txt_itemName + // + this.txt_itemName.Location = new System.Drawing.Point(84, 175); + this.txt_itemName.Name = "txt_itemName"; + this.txt_itemName.Size = new System.Drawing.Size(254, 24); + this.txt_itemName.StyleController = this.layoutMx1; + this.txt_itemName.TabIndex = 825; + this.txt_itemName.Tag = "readonly"; // // layoutControlItem17 // @@ -1230,16 +1245,17 @@ this.layoutControlItem10, this.layoutControlItem32, this.layoutControlItem12, - this.layoutControlItem28, this.layoutControlItem26, this.layoutControlItem31, this.layoutControlItem33, this.layoutControlItem18, this.layoutControlItem29, - this.layoutControlItem6, this.layoutControlItem5, this.layoutControlItem30, - this.layoutControlItem4}); + this.layoutControlItem4, + this.layoutControlItem6, + this.layoutControlItem34, + this.layoutControlItem28}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1359,7 +1375,7 @@ // // layoutControlItem9 // - this.layoutControlItem9.Control = this.txt_fbatchQty; + this.layoutControlItem9.Control = this.txt_checkQty; this.layoutControlItem9.Location = new System.Drawing.Point(330, 0); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; @@ -1380,7 +1396,7 @@ // // layoutControlItem3 // - this.layoutControlItem3.Control = this.txt_logNo1; + this.layoutControlItem3.Control = this.txt_lotNo1; this.layoutControlItem3.Location = new System.Drawing.Point(660, 64); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; @@ -1478,16 +1494,6 @@ this.layoutControlItem12.Text = "澶囨敞璇存槑"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem28 - // - this.layoutControlItem28.Control = this.txt_lotNo; - this.layoutControlItem28.Location = new System.Drawing.Point(0, 196); - this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem28.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem28.Text = "鐢熶骇宸ュ崟"; - this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_workNo; @@ -1543,19 +1549,10 @@ this.layoutControlItem29.Text = "杩斿伐鍗曞彿"; this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_itemModel; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 163); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem6.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem6.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_itemNo; + this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜"; this.layoutControlItem5.Location = new System.Drawing.Point(0, 130); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4; @@ -1582,6 +1579,38 @@ this.layoutControlItem4.Size = new System.Drawing.Size(330, 33); this.layoutControlItem4.Text = "閫夋嫨浜у搧"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_itemModel; + this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸"; + this.layoutControlItem6.Location = new System.Drawing.Point(0, 196); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem6.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem6.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem34 + // + this.layoutControlItem34.Control = this.txt_itemName; + this.layoutControlItem34.Location = new System.Drawing.Point(0, 163); + this.layoutControlItem34.Name = "layoutControlItem34"; + this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem34.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem34.Text = "浜у搧鍚嶇О"; + this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem28 + // + this.layoutControlItem28.Control = this.txt_lotNo; + this.layoutControlItem28.Location = new System.Drawing.Point(990, 229); + this.layoutControlItem28.Name = "layoutControlItem28"; + this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7; + this.layoutControlItem28.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem28.Text = "鐢熶骇宸ュ崟"; + this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); // // xtraTabControl2 // @@ -2476,11 +2505,11 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_logNo1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit(); @@ -2494,6 +2523,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); @@ -2516,16 +2546,17 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2613,8 +2644,8 @@ private DevExpress.XtraEditors.TextEdit txt_remarks; private DevExpress.XtraEditors.TextEdit txt_itemNo; private System.Windows.Forms.Label lbGuid; - private DevExpress.XtraEditors.TextEdit txt_logNo1; - private DevExpress.XtraEditors.TextEdit txt_fbatchQty; + private DevExpress.XtraEditors.TextEdit txt_lotNo1; + private DevExpress.XtraEditors.TextEdit txt_checkQty; private DevExpress.XtraEditors.TextEdit txt_fcheckBy; private DevExpress.XtraEditors.TextEdit txt_fcheckDate; private DevExpress.XtraEditors.TextEdit txt_releaseNo; @@ -2736,16 +2767,18 @@ private DevExpress.XtraEditors.TextEdit textEdit1; private DevExpress.XtraEditors.TextEdit textEdit2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; private DevExpress.XtraEditors.ButtonEdit txt_itemId; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraEditors.TextEdit txt_itemName; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs index 67ac170..0e98dff 100644 --- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs @@ -1,5 +1,4 @@ -锘縰sing Gs.DevApp.DevFrm.QC; -using Gs.DevApp.Entity; +锘縰sing Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using Newtonsoft.Json; @@ -16,7 +15,7 @@ { public partial class Frm_FqcDetect01 : DevExpress.XtraEditors.XtraForm { - string _webServiceName = "MesQaItemsDetect01Manager/"; + string _webServiceName = "FqcManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_FqcDetect01() { @@ -24,6 +23,7 @@ this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; + this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; @@ -44,7 +44,7 @@ }, (value) => { getPageList(this.pageBar1.CurrentPage); - },lbGuid); + }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; txtJianYan.KeyDown += TxtJianYan_KeyDown; @@ -55,17 +55,26 @@ btnIpt.Click += BtnIpt_Click; txt_suppId.getSuppler(""); txt_lineId.getSuppler(""); - txt_itemId.Click += (s, e) => { - var frm = new SelectItem("1"); + txt_itemId.Click += (s, e) => + { + string _lineId = txt_lineId.GetId(); + if (string.IsNullOrEmpty(_lineId)) + { + Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛閫夋嫨浜х嚎锛�"); + return; + } + var frm = new SelectFqcItem(_lineId); frm.UpdateParent += (ss, ee) => { try { - var lst = ee.DynamicList; - foreach (dynamic dym in lst) - { - MessageBox.Show("d"); - } + var lst = new List<dynamic>(); + lst = ee.DynamicList; + txt_itemId.Text = lst[0].itemId; + txt_itemModel.Text = lst[0].itemModel; + txt_itemName.Text = lst[0].itemName; + txt_itemNo.Text = lst[0].itemNo; + txt_lotNo.Text = lst[0].gdbh; } catch (Exception ex) { @@ -74,11 +83,6 @@ }; frm.ShowDialog(); }; - } - - private void Txt_itemId_EditChanged(object sender, EventArgs e) - { - throw new NotImplementedException(); } /// <summary> @@ -90,7 +94,7 @@ private void BtnIpt_Click(object sender, EventArgs e) { bool bl = btnLoad.Enabled; - Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl); + Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input frm = new Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl); frm.ShowDialog(); } @@ -326,7 +330,49 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1); } - + /// <summary> + /// 鍒犻櫎浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_releaseNo, gridView1, "releaseNo"); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) + return; + var _obj = new + { + guid = rowGuid, + mxGuid = Guid.Empty.ToString(), + }; + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "DeleteModelOrMx", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + if (xtraTabControl1.SelectedTabPageIndex == 0) + { } + else + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); + getPageList(this.pageBar1.CurrentPage); + } + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } /// <summary> /// 鍒锋柊浜嬩欢 /// </summary> @@ -401,27 +447,85 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; - if (string.IsNullOrEmpty(txt_remarks.Text.Trim())) + string _txt_djType = txt_djType.Text.Trim(); + string _txt_checkQty = txt_checkQty.Text.Trim(); + string _txt_lifnr = txt_lifnr.Text.Trim(); + string _txt_suppId = txt_suppId.GetId(); + string _txt_lineId = txt_lineId.GetId(); + string _txt_itemId = txt_itemId.Text.Trim(); + string _txt_remarks = txt_remarks.Text.Trim(); + string _txt_workNo = txt_workNo.Text.Trim(); + string _txt_epTag = txt_epTag.Text.Trim(); + string _txt_fzrId = txt_fzrId.GetId(); + string _txt_msg = txt_msg.Text.Trim(); + string _txt_fmanageNo = txt_fmanageNo.Text.Trim(); + string _txt_lotNo2 = txt_lotNo2.Text.Trim(); + string _txt_lotNo1 = txt_lotNo1.Text.Trim(); + string _txt_lotNo = txt_lotNo.Text.Trim(); + if (txt_djType.SelectedIndex<=0) { - Gs.DevApp.ToolBox.MsgHelper.Warning("澶囨敞鑳戒负绌猴紒"); - txt_remarks.Focus(); + Gs.DevApp.ToolBox.MsgHelper.Warning("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�"); + txt_djType.Focus(); + return; + } + if (string.IsNullOrEmpty(_txt_checkQty.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥鏁伴噺涓嶈兘涓虹┖锛�"); + txt_checkQty.Focus(); + return; + } + if (string.IsNullOrEmpty(_txt_lineId.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("浜х嚎涓嶈兘涓虹┖锛�"); + txt_lineId.Focus(); + return; + } + if (string.IsNullOrEmpty(_txt_itemId.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("浜у搧涓嶈兘涓虹┖锛�"); + txt_itemId.Focus(); + return; + } + if (string.IsNullOrEmpty(_txt_itemId.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("浜у搧涓嶈兘涓虹┖锛�"); + txt_itemId.Focus(); + return; + } + if (string.IsNullOrEmpty(_txt_lotNo.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("宸ュ崟鍙蜂笉鑳戒负绌猴紒"); + txt_lotNo.Focus(); return; } var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 - fngDesc = "", - remarks = txt_remarks.Text.Trim(), + djType = _txt_djType, + checkQty = _txt_checkQty, + lifnr = _txt_lifnr, + suppId = _txt_suppId, + lineId = _txt_lineId, + itemId = _txt_itemId, + remarks = _txt_remarks, + workNo = _txt_workNo, + epTag = _txt_epTag, + fzrId = _txt_fzrId, + msg = _txt_msg, + fmanageNo = _txt_fmanageNo, + lotNo2 = _txt_lotNo2, + lotNo1 = _txt_lotNo1, + lotNo = _txt_lotNo }; try { string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { - lbGuid.Text = _rtn.rtnData; + lbGuid.Text = _rtn.rtnData.outGuid; + txt_releaseNo.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false); this.setEable(false); @@ -477,7 +581,6 @@ { ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } - } private void getModel(string strGuid, string guid5) { @@ -744,6 +847,6 @@ btnLoad.Enabled = bl; btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰"); } - + } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs new file mode 100644 index 0000000..a3698c7 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs @@ -0,0 +1,205 @@ +锘縩amespace Gs.DevApp.DevFrm.FQC +{ + partial class SelectFqcItem + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); + this.gcMain = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + this.SuspendLayout(); + // + // gcMain + // + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.MainView = this.gridView1; + this.gcMain.Name = "gcMain"; + this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemButtonEdit1}); + this.gcMain.Size = new System.Drawing.Size(581, 489); + this.gcMain.TabIndex = 3; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn7, + this.gridColumn1, + this.gridColumn2, + this.gridColumn3, + this.gridColumn4, + this.gridColumn5, + this.gridColumn6, + this.gv_Btn}); + this.gridView1.GridControl = this.gcMain; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gv_Btn + // + this.gv_Btn.Caption = "閫夋嫨"; + this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1; + this.gv_Btn.MinWidth = 25; + this.gv_Btn.Name = "gv_Btn"; + this.gv_Btn.Visible = true; + this.gv_Btn.VisibleIndex = 6; + this.gv_Btn.Width = 94; + // + // repositoryItemButtonEdit1 + // + this.repositoryItemButtonEdit1.AutoHeight = false; + editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162; + editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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); + // + // gridColumn1 + // + this.gridColumn1.Caption = "浜х嚎"; + this.gridColumn1.FieldName = "lineName"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 1; + this.gridColumn1.Width = 94; + // + // gridColumn2 + // + this.gridColumn2.Caption = "宸ュ崟缂栧彿"; + this.gridColumn2.FieldName = "gdbh"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 2; + this.gridColumn2.Width = 94; + // + // gridColumn3 + // + this.gridColumn3.Caption = "浜у搧ID"; + this.gridColumn3.FieldName = "itemId"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 3; + this.gridColumn3.Width = 94; + // + // gridColumn4 + // + this.gridColumn4.Caption = "浜у搧缂栫爜"; + this.gridColumn4.FieldName = "itemNo"; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 4; + this.gridColumn4.Width = 94; + // + // gridColumn5 + // + this.gridColumn5.Caption = "浜у搧鍚嶇О"; + this.gridColumn5.FieldName = "itemName"; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 5; + this.gridColumn5.Width = 94; + // + // gridColumn6 + // + this.gridColumn6.Caption = "瑙勬牸鍨嬪彿"; + this.gridColumn6.FieldName = "itemModel"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 6; + this.gridColumn6.Width = 94; + // + // gridColumn7 + // + this.gridColumn7.Caption = "涓婚敭Guid"; + this.gridColumn7.FieldName = "guid"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Width = 94; + // + // SelectFqcItem + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(581, 489); + this.Controls.Add(this.gcMain); + this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "SelectFqcItem"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "閫夋嫨缁勭粐"; + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gv_Btn; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs new file mode 100644 index 0000000..09218f4 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs @@ -0,0 +1,102 @@ +锘� +using Gs.DevApp.ToolBox; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Data; +using System.Windows.Forms; + + +namespace Gs.DevApp.DevFrm.FQC +{ + public partial class SelectFqcItem : DevExpress.XtraEditors.XtraForm + { + private readonly string _webServiceName = "FqcManager/"; + string lineId = ""; + public SelectFqcItem(string _lineId) + { + InitializeComponent(); + this.lineId = _lineId; + getPageList(1); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1); + } + + /// <summary> + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + var _obj = new + { + currentPage = curPage, + everyPageSize = 999999, + sortName = "", + keyWhere = "", + lineId = this.lineId + }; + var json = JsonConvert.SerializeObject(_obj); + try + { + var strReturn = UtilityHelper.HttpPost("", + _webServiceName + "SelectFqcItem", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + } + else + UtilityHelper.SetDefaultTable(gcMain, gridView1); + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gridView1.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + var dr = gridView1.GetDataRow(rowhandle); + var mxGuid = dr["guid"].ToString(); + if (string.IsNullOrEmpty(mxGuid)) + { + return; + } + var list = new List<dynamic>(); + list.Add(new + { + guid = dr["guid"].ToString(), + itemId = dr["itemId"].ToString(), + itemName = dr["itemName"].ToString(), + itemNo = dr["itemNo"].ToString(), + itemModel = dr["itemModel"].ToString(), + gdbh = dr["gdbh"].ToString(), + }); + UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list }); + Close(); + } + } + + /// <summary> + /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢 + /// </summary> + public event EventHandler<UpdateParentEventArgs> UpdateParent; + + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectItem.resx b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.resx similarity index 100% rename from DevApp/Gs.DevApp/DevFrm/FQC/SelectItem.resx rename to DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.resx diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectItem.Designer.cs deleted file mode 100644 index 2024410..0000000 --- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectItem.Designer.cs +++ /dev/null @@ -1,201 +0,0 @@ -锘縩amespace Gs.DevApp.DevFrm.FQC -{ - partial class SelectItem - { - /// <summary> - /// Required designer variable. - /// </summary> - private System.ComponentModel.IContainer components = null; - - /// <summary> - /// Clean up any resources being used. - /// </summary> - /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// <summary> - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// </summary> - private void InitializeComponent() - { - this.gcMain = new DevExpress.XtraGrid.GridControl(); - this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); - this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); - this.btnIn = new DevExpress.XtraEditors.SimpleButton(); - this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); - ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); - this.panelControl1.SuspendLayout(); - this.SuspendLayout(); - // - // gcMain - // - this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain.Location = new System.Drawing.Point(0, 0); - this.gcMain.MainView = this.gridView1; - this.gcMain.Name = "gcMain"; - this.gcMain.Size = new System.Drawing.Size(443, 542); - this.gcMain.TabIndex = 6; - this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { - this.gridView1}); - // - // gridView1 - // - this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; - this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.gridView1.Appearance.Row.Options.UseFont = true; - this.gridView1.ColumnPanelRowHeight = 50; - this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gv_guid, - this.gridColumn1, - this.gridColumn2, - this.gridColumn3, - this.gridColumn4, - this.gridColumn5, - this.gridColumn6}); - this.gridView1.GridControl = this.gcMain; - this.gridView1.IndicatorWidth = 50; - this.gridView1.Name = "gridView1"; - this.gridView1.OptionsFind.ShowSearchNavButtons = false; - this.gridView1.OptionsSelection.MultiSelect = true; - this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect; - this.gridView1.OptionsView.ShowAutoFilterRow = true; - this.gridView1.OptionsView.ShowGroupPanel = false; - // - // gv_guid - // - this.gv_guid.AppearanceCell.Options.UseFont = true; - this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎"; - this.gv_guid.FieldName = "guid"; - this.gv_guid.MinWidth = 10; - this.gv_guid.Name = "gv_guid"; - this.gv_guid.OptionsColumn.AllowEdit = false; - this.gv_guid.OptionsColumn.ReadOnly = true; - this.gv_guid.Tag = "query_a.guid"; - this.gv_guid.Width = 94; - // - // panelControl1 - // - this.panelControl1.Controls.Add(this.btnIn); - this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelControl1.Location = new System.Drawing.Point(0, 542); - this.panelControl1.Name = "panelControl1"; - this.panelControl1.Size = new System.Drawing.Size(443, 43); - this.panelControl1.TabIndex = 9; - // - // btnIn - // - this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; - this.btnIn.Appearance.Options.UseBackColor = true; - this.btnIn.Dock = System.Windows.Forms.DockStyle.Right; - this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161; - this.btnIn.Location = new System.Drawing.Point(347, 2); - this.btnIn.Name = "btnIn"; - this.btnIn.Size = new System.Drawing.Size(94, 39); - this.btnIn.TabIndex = 4; - this.btnIn.Text = "纭畾瀵煎叆"; - // - // gridColumn1 - // - this.gridColumn1.Caption = "浜у搧ID"; - this.gridColumn1.MinWidth = 25; - this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 1; - this.gridColumn1.Width = 94; - // - // gridColumn2 - // - this.gridColumn2.Caption = "浜у搧鍚嶇О"; - this.gridColumn2.MinWidth = 25; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 2; - this.gridColumn2.Width = 94; - // - // gridColumn3 - // - this.gridColumn3.Caption = "瑙勬牸鍨嬪彿"; - this.gridColumn3.MinWidth = 25; - this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 3; - this.gridColumn3.Width = 94; - // - // gridColumn4 - // - this.gridColumn4.Caption = "宸ュ崟鍙�"; - this.gridColumn4.MinWidth = 25; - this.gridColumn4.Name = "gridColumn4"; - this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 4; - this.gridColumn4.Width = 94; - // - // gridColumn5 - // - this.gridColumn5.Caption = "杞﹂棿"; - this.gridColumn5.MinWidth = 25; - this.gridColumn5.Name = "gridColumn5"; - this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 5; - this.gridColumn5.Width = 94; - // - // gridColumn6 - // - this.gridColumn6.Caption = "浜х嚎"; - this.gridColumn6.MinWidth = 25; - this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 6; - this.gridColumn6.Width = 94; - // - // SelectItem - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(443, 585); - this.Controls.Add(this.gcMain); - this.Controls.Add(this.panelControl1); - this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; - this.Name = "SelectItem"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "閫夋嫨宸ュ簭"; - ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); - this.panelControl1.ResumeLayout(false); - this.ResumeLayout(false); - - } - - #endregion - private DevExpress.XtraGrid.GridControl gcMain; - private DevExpress.XtraGrid.Views.Grid.GridView gridView1; - private DevExpress.XtraGrid.Columns.GridColumn gv_guid; - private DevExpress.XtraEditors.PanelControl panelControl1; - private DevExpress.XtraEditors.SimpleButton btnIn; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; - } -} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectItem.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectItem.cs deleted file mode 100644 index 79d490b..0000000 --- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectItem.cs +++ /dev/null @@ -1,81 +0,0 @@ -锘縰sing Gs.DevApp.ToolBox; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Data; -using System.Windows.Forms; - - -namespace Gs.DevApp.DevFrm.FQC -{ - public partial class SelectItem : DevExpress.XtraEditors.XtraForm - { - private readonly string _webServiceName = "FqcManager/"; - string lineId = ""; - public SelectItem(string _lineId) - { - InitializeComponent(); - this.lineId = _lineId; - Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) => - { - }); - getPageList(1); - btnIn.Click += (s, e) => - { - var list = new List<dynamic>(); - int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿 - DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮 - foreach (int idx in rows) - { - list.Add(new - { - fSeq = ($"{(idx + 1) * 10:D4}"), - processNo = dt.Rows[idx]["processNo"].ToString(), - processName = dt.Rows[idx]["processName"].ToString(), - }); - } - UpdateParent?.Invoke(this, - new UpdateParentEventArgs { DynamicList = list }); - Close(); - }; - - } - - /// <summary> - /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢 - /// </summary> - public event EventHandler<UpdateParentEventArgs> UpdateParent; - - /// <summary> - /// </summary> - /// <param name="curPage">绗嚑椤�</param> - /// <param name="pageSize">姣忛〉鍑犳潯</param> - private void getPageList(int curPage) - { - var _obj = new - { - currentPage = curPage, - everyPageSize =999999, - sortName = "", - keyWhere = "", - lineId = this.lineId - }; - var json = JsonConvert.SerializeObject(_obj); - try - { - var strReturn = UtilityHelper.HttpPost("", - _webServiceName + "SelectFqcItem", json); - var dd = UtilityHelper.ReturnToTablePage(strReturn); - var dt = dd.rtnData.list; - gcMain.BindingContext = new BindingContext(); - gcMain.DataSource = dt; - gcMain.ForceInitialize(); - gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - } -} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 62a6d13..f690b68 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -302,11 +302,11 @@ <Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs"> <DependentUpon>Frm_FqcDetect01.cs</DependentUpon> </Compile> - <Compile Include="DevFrm\FQC\SelectItem.cs"> + <Compile Include="DevFrm\FQC\SelectFqcItem.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="DevFrm\FQC\SelectItem.Designer.cs"> - <DependentUpon>SelectItem.cs</DependentUpon> + <Compile Include="DevFrm\FQC\SelectFqcItem.Designer.cs"> + <DependentUpon>SelectFqcItem.cs</DependentUpon> </Compile> <Compile Include="DevFrm\IPQC\Frm_ShouJian.cs"> <SubType>Form</SubType> @@ -1207,8 +1207,8 @@ <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx"> <DependentUpon>Frm_FqcDetect01.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="DevFrm\FQC\SelectItem.resx"> - <DependentUpon>SelectItem.cs</DependentUpon> + <EmbeddedResource Include="DevFrm\FQC\SelectFqcItem.resx"> + <DependentUpon>SelectFqcItem.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\FrmLogin.resx"> <DependentUpon>FrmLogin.cs</DependentUpon> diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs index b2474d0..3be17dd 100644 --- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs +++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs @@ -74,6 +74,7 @@ DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:"+meth, _caption, _size); wdf.BackColor = _color; wdf.Padding = _pad; + wdf.SetCaption("鍔犺浇杩涘害:" + meth); HttpWebRequest request = null; StreamWriter requestStream = null; WebResponse response = null; -- Gitblit v1.9.3