lu
6 天以前 878aad490fc15b11d63fb4fa7ab7ada260f66310
iqc称重
已修改7个文件
588 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/FrmMain.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs 319 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Program.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -335,15 +335,15 @@
            {
                if (item.Name == name)
                {
                    //后来加上,为了释放窗体资源beg
                    //foreach (Control control in item.Controls)
                    //{
                    //    if (control is Form)
                    //    {
                    //        Form myForm = control as Form;
                    //        myForm.Invoke((MethodInvoker)delegate { myForm.Dispose(); }); // 确保 UI 线程安全地释放资源
                    //    }
                    //}
                    //2025-08-08加上,为了释放窗体资源beg
                    foreach (Control control in item.Controls)
                    {
                        if (control is Form)
                        {
                            Form myForm = control as Form;
                            myForm.Invoke((MethodInvoker)delegate { myForm.Dispose(); }); // 确保 UI 线程安全地释放资源
                        }
                    }
                    //后来加上,为了释放窗体资源end
                    tabControl.TabPages.Remove(item);
                    item.Dispose();
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -37,11 +37,12 @@
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
@@ -50,10 +51,10 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
@@ -99,17 +100,19 @@
            this.txtW2 = new DevExpress.XtraEditors.TextEdit();
            this.txtW3 = new DevExpress.XtraEditors.TextEdit();
            this.txtW4 = new DevExpress.XtraEditors.TextEdit();
            this.txtW5 = new DevExpress.XtraEditors.TextEdit();
            this.btnW = new DevExpress.XtraEditors.SimpleButton();
            this.txtWCurrent = new DevExpress.XtraEditors.TextEdit();
            this.txtW5 = new DevExpress.XtraEditors.TextEdit();
            this.btnClean = new DevExpress.XtraEditors.SimpleButton();
            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_fngDesc = new Gs.DevApp.UserControl.UcDictionary();
            this.btnYcReport = new DevExpress.XtraEditors.SimpleButton();
            this.lbGuid = new System.Windows.Forms.Label();
@@ -250,16 +253,17 @@
            ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
@@ -843,7 +847,7 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1435, 688);
            this.splitMx1.SplitterPosition = 278;
            this.splitMx1.SplitterPosition = 270;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
@@ -885,7 +889,7 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(569, 547, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1435, 278);
            this.layoutMx1.Size = new System.Drawing.Size(1435, 270);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
@@ -896,14 +900,15 @@
            this.layWeight.Controls.Add(this.txtW2);
            this.layWeight.Controls.Add(this.txtW3);
            this.layWeight.Controls.Add(this.txtW4);
            this.layWeight.Controls.Add(this.txtW5);
            this.layWeight.Controls.Add(this.btnW);
            this.layWeight.Controls.Add(this.txtWCurrent);
            this.layWeight.Location = new System.Drawing.Point(10, 234);
            this.layWeight.Controls.Add(this.txtW5);
            this.layWeight.Controls.Add(this.btnClean);
            this.layWeight.Location = new System.Drawing.Point(10, 227);
            this.layWeight.Margin = new System.Windows.Forms.Padding(0);
            this.layWeight.Name = "layWeight";
            this.layWeight.Root = this.layoutControlGroup2;
            this.layWeight.Size = new System.Drawing.Size(1061, 34);
            this.layWeight.Size = new System.Drawing.Size(1061, 33);
            this.layWeight.TabIndex = 818;
            this.layWeight.Text = "layoutControl1";
            // 
@@ -911,41 +916,37 @@
            // 
            this.txtW1.Location = new System.Drawing.Point(52, 2);
            this.txtW1.Name = "txtW1";
            this.txtW1.Size = new System.Drawing.Size(95, 24);
            this.txtW1.Properties.ReadOnly = true;
            this.txtW1.Size = new System.Drawing.Size(76, 24);
            this.txtW1.StyleController = this.layWeight;
            this.txtW1.TabIndex = 4;
            // 
            // txtW2
            // 
            this.txtW2.Location = new System.Drawing.Point(201, 2);
            this.txtW2.Location = new System.Drawing.Point(182, 2);
            this.txtW2.Name = "txtW2";
            this.txtW2.Size = new System.Drawing.Size(98, 24);
            this.txtW2.Properties.ReadOnly = true;
            this.txtW2.Size = new System.Drawing.Size(79, 24);
            this.txtW2.StyleController = this.layWeight;
            this.txtW2.TabIndex = 5;
            // 
            // txtW3
            // 
            this.txtW3.Location = new System.Drawing.Point(353, 2);
            this.txtW3.Location = new System.Drawing.Point(315, 2);
            this.txtW3.Name = "txtW3";
            this.txtW3.Size = new System.Drawing.Size(98, 24);
            this.txtW3.Properties.ReadOnly = true;
            this.txtW3.Size = new System.Drawing.Size(79, 24);
            this.txtW3.StyleController = this.layWeight;
            this.txtW3.TabIndex = 6;
            // 
            // txtW4
            // 
            this.txtW4.Location = new System.Drawing.Point(505, 2);
            this.txtW4.Location = new System.Drawing.Point(448, 2);
            this.txtW4.Name = "txtW4";
            this.txtW4.Size = new System.Drawing.Size(98, 24);
            this.txtW4.Properties.ReadOnly = true;
            this.txtW4.Size = new System.Drawing.Size(79, 24);
            this.txtW4.StyleController = this.layWeight;
            this.txtW4.TabIndex = 7;
            //
            // txtW5
            //
            this.txtW5.Location = new System.Drawing.Point(657, 2);
            this.txtW5.Name = "txtW5";
            this.txtW5.Size = new System.Drawing.Size(98, 24);
            this.txtW5.StyleController = this.layWeight;
            this.txtW5.TabIndex = 8;
            // 
            // btnW
            // 
@@ -953,21 +954,41 @@
            this.btnW.Appearance.ForeColor = System.Drawing.Color.White;
            this.btnW.Appearance.Options.UseBackColor = true;
            this.btnW.Appearance.Options.UseForeColor = true;
            this.btnW.Location = new System.Drawing.Point(911, 2);
            this.btnW.Location = new System.Drawing.Point(797, 2);
            this.btnW.Name = "btnW";
            this.btnW.Size = new System.Drawing.Size(148, 27);
            this.btnW.Size = new System.Drawing.Size(129, 27);
            this.btnW.StyleController = this.layWeight;
            this.btnW.TabIndex = 9;
            this.btnW.Text = "获取";
            // 
            // txtWCurrent
            // 
            this.txtWCurrent.Location = new System.Drawing.Point(759, 2);
            this.txtWCurrent.Location = new System.Drawing.Point(664, 2);
            this.txtWCurrent.Name = "txtWCurrent";
            this.txtWCurrent.Properties.ReadOnly = true;
            this.txtWCurrent.Size = new System.Drawing.Size(148, 24);
            this.txtWCurrent.Size = new System.Drawing.Size(129, 24);
            this.txtWCurrent.StyleController = this.layWeight;
            this.txtWCurrent.TabIndex = 10;
            //
            // txtW5
            //
            this.txtW5.Location = new System.Drawing.Point(581, 2);
            this.txtW5.Name = "txtW5";
            this.txtW5.Properties.ReadOnly = true;
            this.txtW5.Size = new System.Drawing.Size(79, 24);
            this.txtW5.StyleController = this.layWeight;
            this.txtW5.TabIndex = 11;
            //
            // btnClean
            //
            this.btnClean.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
            this.btnClean.Appearance.Options.UseBackColor = true;
            this.btnClean.Location = new System.Drawing.Point(930, 2);
            this.btnClean.Name = "btnClean";
            this.btnClean.Size = new System.Drawing.Size(129, 27);
            this.btnClean.StyleController = this.layWeight;
            this.btnClean.TabIndex = 12;
            this.btnClean.Text = "清空";
            // 
            // layoutControlGroup2
            // 
@@ -978,9 +999,10 @@
            this.layoutControlItem32,
            this.layoutControlItem33,
            this.layoutControlItem34,
            this.layoutControlItem35,
            this.layoutControlItem36,
            this.layoutControlItem37});
            this.layoutControlItem37,
            this.layoutControlItem35,
            this.layoutControlItem38});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "layoutControlGroup2";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -997,6 +1019,8 @@
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
@@ -1004,13 +1028,14 @@
            columnDefinition4,
            columnDefinition5,
            columnDefinition6,
            columnDefinition7});
            columnDefinition7,
            columnDefinition8});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1});
            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup2.Size = new System.Drawing.Size(1061, 34);
            this.layoutControlGroup2.Size = new System.Drawing.Size(1061, 33);
            this.layoutControlGroup2.TextVisible = false;
            // 
            // layoutControlItem31
@@ -1018,57 +1043,47 @@
            this.layoutControlItem31.Control = this.txtW1;
            this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.Size = new System.Drawing.Size(149, 34);
            this.layoutControlItem31.Size = new System.Drawing.Size(130, 33);
            this.layoutControlItem31.Text = "重量1";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(38, 18);
            // 
            // layoutControlItem32
            // 
            this.layoutControlItem32.Control = this.txtW2;
            this.layoutControlItem32.Location = new System.Drawing.Point(149, 0);
            this.layoutControlItem32.Location = new System.Drawing.Point(130, 0);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem32.Size = new System.Drawing.Size(152, 34);
            this.layoutControlItem32.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem32.Text = "重量2";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(38, 18);
            // 
            // layoutControlItem33
            // 
            this.layoutControlItem33.Control = this.txtW3;
            this.layoutControlItem33.Location = new System.Drawing.Point(301, 0);
            this.layoutControlItem33.Location = new System.Drawing.Point(263, 0);
            this.layoutControlItem33.Name = "layoutControlItem33";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem33.Size = new System.Drawing.Size(152, 34);
            this.layoutControlItem33.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem33.Text = "重量3";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(38, 18);
            // 
            // layoutControlItem34
            // 
            this.layoutControlItem34.Control = this.txtW4;
            this.layoutControlItem34.Location = new System.Drawing.Point(453, 0);
            this.layoutControlItem34.Location = new System.Drawing.Point(396, 0);
            this.layoutControlItem34.Name = "layoutControlItem34";
            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem34.Size = new System.Drawing.Size(152, 34);
            this.layoutControlItem34.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem34.Text = "重量4";
            this.layoutControlItem34.TextSize = new System.Drawing.Size(38, 18);
            //
            // layoutControlItem35
            //
            this.layoutControlItem35.Control = this.txtW5;
            this.layoutControlItem35.Location = new System.Drawing.Point(605, 0);
            this.layoutControlItem35.Name = "layoutControlItem35";
            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem35.Size = new System.Drawing.Size(152, 34);
            this.layoutControlItem35.Text = "重量5";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
            // 
            // layoutControlItem36
            // 
            this.layoutControlItem36.Control = this.btnW;
            this.layoutControlItem36.Location = new System.Drawing.Point(909, 0);
            this.layoutControlItem36.Location = new System.Drawing.Point(795, 0);
            this.layoutControlItem36.Name = "layoutControlItem36";
            this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
            this.layoutControlItem36.Size = new System.Drawing.Size(152, 34);
            this.layoutControlItem36.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem36.Text = "获取";
            this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem36.TextVisible = false;
@@ -1076,20 +1091,41 @@
            // layoutControlItem37
            // 
            this.layoutControlItem37.Control = this.txtWCurrent;
            this.layoutControlItem37.Location = new System.Drawing.Point(757, 0);
            this.layoutControlItem37.Location = new System.Drawing.Point(662, 0);
            this.layoutControlItem37.Name = "layoutControlItem37";
            this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
            this.layoutControlItem37.Size = new System.Drawing.Size(152, 34);
            this.layoutControlItem37.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem37.Text = "实时重量";
            this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem37.TextVisible = false;
            // 
            // layoutControlItem35
            //
            this.layoutControlItem35.Control = this.txtW5;
            this.layoutControlItem35.Location = new System.Drawing.Point(529, 0);
            this.layoutControlItem35.Name = "layoutControlItem35";
            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem35.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem35.Text = "称重5";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
            //
            // layoutControlItem38
            //
            this.layoutControlItem38.Control = this.btnClean;
            this.layoutControlItem38.Location = new System.Drawing.Point(928, 0);
            this.layoutControlItem38.Name = "layoutControlItem38";
            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 7;
            this.layoutControlItem38.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem38.Text = "清空";
            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem38.TextVisible = false;
            //
            // txt_fngDesc
            // 
            this.txt_fngDesc.BtnTxt = "异常描述";
            this.txt_fngDesc.Location = new System.Drawing.Point(12, 172);
            this.txt_fngDesc.Location = new System.Drawing.Point(12, 167);
            this.txt_fngDesc.Name = "txt_fngDesc";
            this.txt_fngDesc.Size = new System.Drawing.Size(703, 60);
            this.txt_fngDesc.Size = new System.Drawing.Size(703, 58);
            this.txt_fngDesc.TabIndex = 815;
            this.txt_fngDesc.TextTxt = "";
            this.txt_fngDesc.WhereTxt = " a.s_type=\'QC异常描述\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -1097,7 +1133,7 @@
            // btnYcReport
            // 
            this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
            this.btnYcReport.Location = new System.Drawing.Point(719, 172);
            this.btnYcReport.Location = new System.Drawing.Point(719, 167);
            this.btnYcReport.Name = "btnYcReport";
            this.btnYcReport.Size = new System.Drawing.Size(116, 27);
            this.btnYcReport.StyleController = this.layoutMx1;
@@ -1116,7 +1152,7 @@
            // 
            // txt_suppName
            // 
            this.txt_suppName.Location = new System.Drawing.Point(437, 108);
            this.txt_suppName.Location = new System.Drawing.Point(437, 105);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Size = new System.Drawing.Size(278, 24);
            this.txt_suppName.StyleController = this.layoutMx1;
@@ -1125,7 +1161,7 @@
            // 
            // txt_remarks
            // 
            this.txt_remarks.Location = new System.Drawing.Point(84, 140);
            this.txt_remarks.Location = new System.Drawing.Point(84, 136);
            this.txt_remarks.Name = "txt_remarks";
            this.txt_remarks.Properties.Appearance.Options.UseFont = true;
            this.txt_remarks.Size = new System.Drawing.Size(631, 24);
@@ -1135,7 +1171,7 @@
            // 
            // txt_fcheckResu
            // 
            this.txt_fcheckResu.Location = new System.Drawing.Point(791, 108);
            this.txt_fcheckResu.Location = new System.Drawing.Point(791, 105);
            this.txt_fcheckResu.Name = "txt_fcheckResu";
            this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
@@ -1146,7 +1182,7 @@
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(84, 44);
            this.txt_itemName.Location = new System.Drawing.Point(84, 43);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(277, 24);
@@ -1186,7 +1222,7 @@
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(84, 76);
            this.txt_itemNo.Location = new System.Drawing.Point(84, 74);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(277, 24);
@@ -1196,7 +1232,7 @@
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(84, 108);
            this.txt_itemModel.Location = new System.Drawing.Point(84, 105);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Size = new System.Drawing.Size(277, 24);
            this.txt_itemModel.StyleController = this.layoutMx1;
@@ -1214,7 +1250,7 @@
            // 
            // txt_fcheckBy
            // 
            this.txt_fcheckBy.Location = new System.Drawing.Point(791, 44);
            this.txt_fcheckBy.Location = new System.Drawing.Point(791, 43);
            this.txt_fcheckBy.Name = "txt_fcheckBy";
            this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
            this.txt_fcheckBy.Size = new System.Drawing.Size(278, 24);
@@ -1224,7 +1260,7 @@
            // 
            // txt_fbatchQty
            // 
            this.txt_fbatchQty.Location = new System.Drawing.Point(437, 76);
            this.txt_fbatchQty.Location = new System.Drawing.Point(437, 74);
            this.txt_fbatchQty.Name = "txt_fbatchQty";
            this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
            this.txt_fbatchQty.Size = new System.Drawing.Size(278, 24);
@@ -1234,7 +1270,7 @@
            // 
            // txt_fsubmitDate
            // 
            this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 44);
            this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 43);
            this.txt_fsubmitDate.Name = "txt_fsubmitDate";
            this.txt_fsubmitDate.Size = new System.Drawing.Size(278, 24);
            this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -1243,7 +1279,7 @@
            // 
            // txt_fsubmitBy
            // 
            this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 76);
            this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 74);
            this.txt_fsubmitBy.Name = "txt_fsubmitBy";
            this.txt_fsubmitBy.Size = new System.Drawing.Size(278, 24);
            this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1262,7 +1298,7 @@
            // 
            // txt_slOrg
            // 
            this.txt_slOrg.Location = new System.Drawing.Point(791, 140);
            this.txt_slOrg.Location = new System.Drawing.Point(791, 136);
            this.txt_slOrg.Name = "txt_slOrg";
            this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
            this.txt_slOrg.StyleController = this.layoutMx1;
@@ -1280,7 +1316,7 @@
            // 
            // txt_checkStates
            // 
            this.txt_checkStates.Location = new System.Drawing.Point(791, 76);
            this.txt_checkStates.Location = new System.Drawing.Point(791, 74);
            this.txt_checkStates.Name = "txt_checkStates";
            this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
@@ -1302,7 +1338,7 @@
            // 
            // txt_cgdNo
            // 
            this.txt_cgdNo.Location = new System.Drawing.Point(437, 44);
            this.txt_cgdNo.Location = new System.Drawing.Point(437, 43);
            this.txt_cgdNo.Name = "txt_cgdNo";
            this.txt_cgdNo.Size = new System.Drawing.Size(278, 24);
            this.txt_cgdNo.StyleController = this.layoutMx1;
@@ -1311,7 +1347,7 @@
            // 
            // txt_fngHandle
            // 
            this.txt_fngHandle.Location = new System.Drawing.Point(1145, 108);
            this.txt_fngHandle.Location = new System.Drawing.Point(1145, 105);
            this.txt_fngHandle.Name = "txt_fngHandle";
            this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
@@ -1322,16 +1358,16 @@
            // 
            // txt_xblb
            // 
            this.txt_xblb.Location = new System.Drawing.Point(1145, 172);
            this.txt_xblb.Location = new System.Drawing.Point(1145, 167);
            this.txt_xblb.Name = "txt_xblb";
            this.txt_xblb.Size = new System.Drawing.Size(278, 60);
            this.txt_xblb.Size = new System.Drawing.Size(278, 58);
            this.txt_xblb.StyleController = this.layoutMx1;
            this.txt_xblb.TabIndex = 816;
            this.txt_xblb.Tag = "readonly";
            // 
            // txt_xbsl
            // 
            this.txt_xbsl.Location = new System.Drawing.Point(1145, 140);
            this.txt_xbsl.Location = new System.Drawing.Point(1145, 136);
            this.txt_xbsl.Name = "txt_xbsl";
            this.txt_xbsl.Size = new System.Drawing.Size(278, 24);
            this.txt_xbsl.StyleController = this.layoutMx1;
@@ -1412,19 +1448,19 @@
            this.layoutControlItem27});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11.Width = 100D;
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition8,
            columnDefinition9,
            columnDefinition10,
            columnDefinition11});
            columnDefinition11,
            columnDefinition12});
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
@@ -1450,7 +1486,7 @@
            rowDefinition7,
            rowDefinition8,
            rowDefinition9});
            this.Root.Size = new System.Drawing.Size(1435, 278);
            this.Root.Size = new System.Drawing.Size(1435, 270);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -1458,59 +1494,59 @@
            this.layoutControlItem1.Control = this.txt_releaseNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(353, 32);
            this.layoutControlItem1.Size = new System.Drawing.Size(353, 31);
            this.layoutControlItem1.Text = "检验单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_itemName;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(353, 32);
            this.layoutControlItem4.Size = new System.Drawing.Size(353, 31);
            this.layoutControlItem4.Text = "物料名称";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_itemNo;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(353, 32);
            this.layoutControlItem5.Size = new System.Drawing.Size(353, 31);
            this.layoutControlItem5.Text = "物料编码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_itemModel;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem6.Size = new System.Drawing.Size(353, 32);
            this.layoutControlItem6.Size = new System.Drawing.Size(353, 31);
            this.layoutControlItem6.Text = "物料规格";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_fsubmitDate;
            this.layoutControlItem15.Location = new System.Drawing.Point(1061, 32);
            this.layoutControlItem15.Location = new System.Drawing.Point(1061, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem15.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem15.Text = "审核日期";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_fsubmitBy;
            this.layoutControlItem16.Location = new System.Drawing.Point(1061, 64);
            this.layoutControlItem16.Location = new System.Drawing.Point(1061, 62);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem16.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem16.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem16.Text = "审核人员";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1520,7 +1556,7 @@
            this.layoutControlItem14.Location = new System.Drawing.Point(1061, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem14.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem14.Text = "审核标识";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
@@ -1528,66 +1564,66 @@
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_remarks;
            this.layoutControlItem12.Location = new System.Drawing.Point(0, 128);
            this.layoutControlItem12.Location = new System.Drawing.Point(0, 124);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem12.Size = new System.Drawing.Size(707, 32);
            this.layoutControlItem12.Size = new System.Drawing.Size(707, 31);
            this.layoutControlItem12.Text = "收料备注";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_fcheckResu;
            this.layoutControlItem10.Location = new System.Drawing.Point(707, 96);
            this.layoutControlItem10.Location = new System.Drawing.Point(707, 93);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem10.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem10.Text = "检验结果";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_suppName;
            this.layoutControlItem13.Location = new System.Drawing.Point(353, 96);
            this.layoutControlItem13.Location = new System.Drawing.Point(353, 93);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem13.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem13.Text = "供应商";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem22
            // 
            this.layoutControlItem22.Control = this.txt_checkStates;
            this.layoutControlItem22.Location = new System.Drawing.Point(707, 64);
            this.layoutControlItem22.Location = new System.Drawing.Point(707, 62);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem22.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem22.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem22.Text = "检验状态";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_fbatchQty;
            this.layoutControlItem9.Location = new System.Drawing.Point(353, 64);
            this.layoutControlItem9.Location = new System.Drawing.Point(353, 62);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem9.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem9.Text = "收货数量";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_fcheckBy;
            this.layoutControlItem8.Location = new System.Drawing.Point(707, 32);
            this.layoutControlItem8.Location = new System.Drawing.Point(707, 31);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem8.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem8.Text = "检验人员";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1597,7 +1633,7 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(707, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem2.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem2.Text = "检验日期";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1607,41 +1643,41 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(353, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem3.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem3.Text = "送检批号";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem24
            // 
            this.layoutControlItem24.Control = this.txt_cgdNo;
            this.layoutControlItem24.Location = new System.Drawing.Point(353, 32);
            this.layoutControlItem24.Location = new System.Drawing.Point(353, 31);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem24.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem24.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem24.Text = "采购单号";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_slOrg;
            this.layoutControlItem18.Location = new System.Drawing.Point(707, 128);
            this.layoutControlItem18.Location = new System.Drawing.Point(707, 124);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem18.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem18.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem18.Text = "收料组织";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.txt_fngDesc;
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 160);
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 155);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem28.Size = new System.Drawing.Size(707, 64);
            this.layoutControlItem28.Size = new System.Drawing.Size(707, 62);
            this.layoutControlItem28.Text = "异常备注";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem28.TextVisible = false;
@@ -1649,46 +1685,46 @@
            // layoutControlItem25
            // 
            this.layoutControlItem25.Control = this.txt_fngHandle;
            this.layoutControlItem25.Location = new System.Drawing.Point(1061, 96);
            this.layoutControlItem25.Location = new System.Drawing.Point(1061, 93);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem25.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem25.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem25.Text = "处理意见";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem26
            // 
            this.layoutControlItem26.Control = this.txt_xblb;
            this.layoutControlItem26.Location = new System.Drawing.Point(1061, 160);
            this.layoutControlItem26.Location = new System.Drawing.Point(1061, 155);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem26.Size = new System.Drawing.Size(354, 64);
            this.layoutControlItem26.Size = new System.Drawing.Size(354, 62);
            this.layoutControlItem26.Text = "选别类别";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem29
            // 
            this.layoutControlItem29.Control = this.txt_xbsl;
            this.layoutControlItem29.Location = new System.Drawing.Point(1061, 128);
            this.layoutControlItem29.Location = new System.Drawing.Point(1061, 124);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem29.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem29.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem29.Text = "挑选数量";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem30
            // 
            this.layoutControlItem30.Control = this.layWeight;
            this.layoutControlItem30.Location = new System.Drawing.Point(0, 224);
            this.layoutControlItem30.Location = new System.Drawing.Point(0, 217);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 3;
            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem30.Size = new System.Drawing.Size(1061, 34);
            this.layoutControlItem30.Size = new System.Drawing.Size(1061, 33);
            this.layoutControlItem30.Text = "称重";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem30.TextVisible = false;
@@ -1696,13 +1732,13 @@
            // layoutControlItem27
            // 
            this.layoutControlItem27.Control = this.btnYcReport;
            this.layoutControlItem27.Location = new System.Drawing.Point(707, 160);
            this.layoutControlItem27.Location = new System.Drawing.Point(707, 155);
            this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem27.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem27.Text = "查看异常报告";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
@@ -1714,7 +1750,7 @@
            this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl2.Name = "xtraTabControl2";
            this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
            this.xtraTabControl2.Size = new System.Drawing.Size(1435, 398);
            this.xtraTabControl2.Size = new System.Drawing.Size(1435, 406);
            this.xtraTabControl2.TabIndex = 3;
            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1725,7 +1761,7 @@
            this.tabMxPage1.Controls.Add(this.splitMx2);
            this.tabMxPage1.Controls.Add(this.panMsg);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1433, 366);
            this.tabMxPage1.Size = new System.Drawing.Size(1433, 374);
            this.tabMxPage1.Text = "抽样信息";
            // 
            // splitMx2
@@ -1744,7 +1780,7 @@
            // 
            this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
            this.splitMx2.Panel2.Text = "Panel2";
            this.splitMx2.Size = new System.Drawing.Size(1433, 319);
            this.splitMx2.Size = new System.Drawing.Size(1433, 327);
            this.splitMx2.SplitterPosition = 287;
            this.splitMx2.TabIndex = 3;
            // 
@@ -2017,7 +2053,7 @@
            // 
            this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
            this.splitYangLi.Panel2.Text = "Panel2";
            this.splitYangLi.Size = new System.Drawing.Size(1433, 20);
            this.splitYangLi.Size = new System.Drawing.Size(1433, 28);
            this.splitYangLi.SplitterPosition = 676;
            this.splitYangLi.TabIndex = 4;
            // 
@@ -2027,7 +2063,7 @@
            this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupControl1.Location = new System.Drawing.Point(0, 0);
            this.groupControl1.Name = "groupControl1";
            this.groupControl1.Size = new System.Drawing.Size(676, 20);
            this.groupControl1.Size = new System.Drawing.Size(676, 28);
            this.groupControl1.TabIndex = 3;
            this.groupControl1.Text = "检测结果";
            // 
@@ -2125,7 +2161,7 @@
            this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupControl2.Location = new System.Drawing.Point(0, 0);
            this.groupControl2.Name = "groupControl2";
            this.groupControl2.Size = new System.Drawing.Size(745, 20);
            this.groupControl2.Size = new System.Drawing.Size(745, 28);
            this.groupControl2.TabIndex = 4;
            this.groupControl2.Text = "样本结果";
            // 
@@ -2293,19 +2329,19 @@
            this.layoutControlItem19});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.Width = 100D;
            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition13.Width = 100D;
            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition14.Width = 100D;
            columnDefinition15.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition15.Width = 110D;
            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition15.Width = 100D;
            columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition16.Width = 110D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition12,
            columnDefinition13,
            columnDefinition14,
            columnDefinition15});
            columnDefinition15,
            columnDefinition16});
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
@@ -2359,7 +2395,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.ucUpFileList1);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1433, 366);
            this.tabMxPage2.Size = new System.Drawing.Size(1433, 374);
            this.tabMxPage2.Text = "附件信息";
            // 
            // ucUpFileList1
@@ -2369,7 +2405,7 @@
            this.ucUpFileList1.Name = "ucUpFileList1";
            this.ucUpFileList1.parentGroup = null;
            this.ucUpFileList1.pGuid = null;
            this.ucUpFileList1.Size = new System.Drawing.Size(1433, 366);
            this.ucUpFileList1.Size = new System.Drawing.Size(1433, 374);
            this.ucUpFileList1.TabIndex = 0;
            // 
            // repositoryItemComboBox2
@@ -2441,16 +2477,17 @@
            ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
@@ -2704,16 +2741,18 @@
        private DevExpress.XtraEditors.TextEdit txtW2;
        private DevExpress.XtraEditors.TextEdit txtW3;
        private DevExpress.XtraEditors.TextEdit txtW4;
        private DevExpress.XtraEditors.TextEdit txtW5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
        private DevExpress.XtraEditors.SimpleButton btnW;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
        private DevExpress.XtraEditors.TextEdit txtWCurrent;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraEditors.TextEdit txtW5;
        private DevExpress.XtraEditors.SimpleButton btnClean;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,3 +1,5 @@
using DevExpress.Pdf.Native.BouncyCastle.Utilities.Collections;
using DevExpress.XtraRichEdit.API.Native;
using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -10,6 +12,7 @@
using System.Data;
using System.Net;
using System.Threading.Tasks;
using System.Timers;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -19,6 +22,10 @@
        string _strTag = "N:不合格";
        string _webServiceName = "MesQaItemsDetect01Manager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        /// <summary>
        /// 定时刷新
        /// </summary>
        System.Timers.Timer timer = new System.Timers.Timer(1000);
        public Frm_MesQaItemsDetect01()
        {
            InitializeComponent();
@@ -54,8 +61,147 @@
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            btnIpt.Click += BtnIpt_Click;
            btnYcReport.Click += BtnYcReport_Click;
        }
            //关闭时释放timer
            this.Disposed += (s, e) =>
            {
                // MessageBox.Show("ddddddd");
                if (timer != null)
                {
                    timer.Stop();
                    timer.Dispose();
                }
            };
            timer.Elapsed += (s, e) =>
            {
                var _obj = new
                {
                };
                try
                {
                    var strReturn = UtilityHelper.HttpPost("", "WorkWeight/GetIqcWeight", JsonConvert.SerializeObject(_obj), false);
                    var dd = UtilityHelper.ReturnToDynamic(strReturn);
                    if (dd.rtnCode > 0)
                    {
                        BeginInvoke(new Action(() =>
                        {
                            txtWCurrent.Text = dd.rtnData;
                        }));
                    }
                }
                catch (Exception ex)
                {
                }
            };
            timer.AutoReset = true; // 设置为true表示重复执行,false表示执行一次后停止
            timer.Enabled = true; // 开始计时
            //读取重量
            this.btnW.Click += (s, e) =>
            {
                string _strCurrent = this.txtWCurrent.Text.Trim();
                bool _isNumeric = decimal.TryParse(_strCurrent, out _);
                if (!_isNumeric)
                {
                    ToolBox.MsgHelper.ShowError("请检查称重设置!");
                    return;
                }
                decimal _decCurrent = decimal.Parse(_strCurrent);
                if (_decCurrent * 1 <= 0)
                {
                    ToolBox.MsgHelper.ShowError("请检查称重设置!");
                    return;
                }
                if (txtW1.Text.Trim().Length <= 0)
                {
                    _setWeigth(1, _strCurrent);
                    return;
                }
                if (txtW2.Text.Trim().Length <= 0)
                {
                    _setWeigth(2, _strCurrent);
                    return;
                }
                if (txtW3.Text.Trim().Length <= 0)
                {
                    _setWeigth(3, _strCurrent);
                    return;
                }
                if (txtW4.Text.Trim().Length <= 0)
                {
                    _setWeigth(4, _strCurrent);
                    return;
                }
                if (txtW5.Text.Trim().Length <= 0)
                {
                    _setWeigth(5, _strCurrent);
                    return;
                }
                ToolBox.MsgHelper.ShowError("重量已获取完毕!");
                return;
            };
            //清空
            this.btnClean.Click += (s, e) =>
            {
                _setWeigth(1, "");
                this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
            };
        }
        /// <summary>
        /// 提交称重
        /// </summary>
        /// <param name="_weightType"></param>
        /// <param name="_weight"></param>
        private void _setWeigth(int _weightType, string _weight)
        {
            var _obj = new
            {
                iqcGuid = this.txt_guid.Text.Trim(),
                weightType = _weightType,
                weight = _weight
            };
            try
            {
                var strReturn = UtilityHelper.HttpPost("", "WorkWeight/EditIqc", JsonConvert.SerializeObject(_obj), false);
                var dd = UtilityHelper.ReturnToDynamic(strReturn);
                if (dd.rtnCode <= 0)
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
                else
                {
                    if (_weightType == 1)
                    {
                        txtW1.Text = _weight;
                        return;
                    }
                    if (_weightType == 2)
                    {
                        txtW2.Text = _weight;
                        return;
                    }
                    if (_weightType == 3)
                    {
                        txtW3.Text = _weight;
                        return;
                    }
                    if (_weightType == 4)
                    {
                        txtW4.Text = _weight;
                        return;
                    }
                    if (_weightType == 5)
                    {
                        txtW5.Text = _weight;
                        return;
                    }
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// 批量录入
@@ -591,6 +737,7 @@
            txtJianYan.ReadOnly = !bl;
            btnLoad.Enabled = bl;
            btnIpt.Text = (bl == true ? "录入样本" : "查看样本");
            btnW.Enabled = btnClean.Enabled = bl;
        }
        #region 打开父亲窗口委托,查看异常报告
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs
@@ -15,8 +15,8 @@
{
    public partial class Frm_Work09 : DevExpress.XtraEditors.XtraForm
    {
        string _strType = "";
        string _webServiceName = "WorkWeight/";
        string value = string.Empty;
        /// <summary>
        /// 串口类
        /// </summary>
@@ -25,9 +25,11 @@
        /// gridview定时刷新
        /// </summary>
        System.Timers.Timer timer = new System.Timers.Timer(10000);
        public Frm_Work09()
        public Frm_Work09(string strType)
        {
            InitializeComponent();
            this._strType = strType;
            this.Text = _strType + ":" + this.Text;
            this.FormClosing += (s, e) =>
            {
                if (Sp.IsOpen)
@@ -39,7 +41,10 @@
                }
            };
            GetComList();
            this.comLine.getSuppler("");
            if (this._strType == QcSeason.产线称重.ToString())
            {
                this.comLine.getSuppler("");
            }
            gvMx1.OptionsFind.ShowSearchNavButtons = false;
            gvMx1.OptionsView.ShowAutoFilterRow = false;
            gvMx1.OptionsView.ShowGroupPanel = false;
@@ -87,17 +92,20 @@
        private void btnStart_Click(object sender, EventArgs e)
        {
            Sp.DataReceived -= new SerialDataReceivedEventHandler(Sp_DataReceived);
            string _comLine = comLine.GetId();
            string _cmbSerialPortNum = cmbSerialPortNum.Text.Trim();
            string _cmbBaudRate = cmbBaudRate.Text.Trim();
            string _comSjw = comSjw.Text.Trim();
            string _comStopBits = comStopBits.Text.Trim();
            string _comParity = comParity.Text.Trim();
            if (string.IsNullOrEmpty(_comLine))
            if (this._strType == QcSeason.产线称重.ToString())
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择线体");
                this.comLine.Focus();
                return;
                string _comLine = comLine.GetId();
                if (string.IsNullOrEmpty(_comLine))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择线体");
                    this.comLine.Focus();
                    return;
                }
            }
            if (cmbSerialPortNum.SelectedIndex < 0)
            {
@@ -185,7 +193,7 @@
                if (i > 0)
                {
                    _tmpStr = Sp.ReadExisting();
                   // Thread.Sleep(1000);
                    // Thread.Sleep(1000);
                    LogHelper.Debug(this.ToString(), $"监听到数据,字节长度:{i.ToString()},{_tmpStr}");
                    this.BeginInvoke(new Action(() =>
                    {
@@ -206,9 +214,9 @@
                            LogHelper.Debug(this.ToString(), "_tmpStr不包含重量+,退出上报");
                            return;
                        }
                        string[] _ary=_tmpStr.Split('+');
                        string[] _ary = _tmpStr.Split('+');
                        string abc = _ary.Last();//ST,GS,
                        txtNum.Text = (abc.Trim().Replace("k", "").Replace("g", "").Replace("S","").Replace("T","").Replace("G","").Replace(",",""));
                        txtNum.Text = (abc.Trim().Replace("k", "").Replace("g", "").Replace("S", "").Replace("T", "").Replace("G", "").Replace(",", ""));
                        addModel(txtNum.Text, _tmpStr);
                    }));
                }
@@ -242,7 +250,13 @@
        /// <param name="_realWeightTxt">原子串</param>
        private void addModel(string _realWeight, string _realWeightTxt)
        {
            string _lineId = comLine.GetId();
            string _lineId = "";
            if (this._strType == QcSeason.产线称重.ToString())
            {
                _lineId = comLine.GetId();
            }
            else
                _lineId = "0";
            var _obj = new
            {
                lineId = _lineId,
@@ -272,13 +286,14 @@
        /// <param name="e"></param>
        private void OnTimedEvent(Object source, ElapsedEventArgs e)
        {
            if (this._strType == QcSeason.iqc称重.ToString())
                return;
            var _obj = new
            {
                lineId = comLine.GetId(),
            };
            try
            {
                var lst = new List<string>();
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModelList", JsonConvert.SerializeObject(_obj), false);
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;
DevApp/Gs.DevApp/Program.cs
@@ -3,6 +3,7 @@
using Gs.DevApp.DevFrm;
using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using System;
using System.Diagnostics;
using System.IO;
@@ -62,7 +63,7 @@
                    {
                    }
                    if (IsWeight == true)
                        Application.Run(new Frm_Work09());
                        Application.Run(new Frm_Work09(QcSeason.产线称重.ToString()));
                    else
                        Application.Run(new FrmMain());
                }
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -62,13 +62,17 @@
        /// <returns></returns>
        public static string HttpPost(string url, string meth, string param, bool isLoading = true)
        {
            Size _size; string _caption; Color _color; Padding _pad;
            (_size, _caption, _color, _pad) = getLoading();
            DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("加载进度:" + meth, _caption, _size);
            wdf.BackColor = _color;
            wdf.Padding = _pad;
            wdf.SetCaption("加载进度:" + meth);
            wdf.Visible = isLoading;
            DevExpress.Utils.WaitDialogForm wdf = null;
            if (isLoading == true)
            {
                Size _size; string _caption; Color _color; Padding _pad;
                (_size, _caption, _color, _pad) = getLoading();
                wdf = new DevExpress.Utils.WaitDialogForm("加载进度:" + meth, _caption, _size);
                wdf.BackColor = _color;
                wdf.Padding = _pad;
                wdf.SetCaption("加载进度:" + meth);
                wdf.Visible = isLoading;
            }
            HttpWebRequest request = null;
            StreamWriter requestStream = null;
            WebResponse response = null;
@@ -103,7 +107,8 @@
            }
            catch (Exception ex)
            {
                wdf.Close();
                if (wdf != null)
                    wdf.Close();
                LogHelper.Debug(url, param + ":" + ex.Message);
                throw ex;
            }
@@ -113,7 +118,8 @@
                requestStream = null;
                response = null;
            }
            wdf.Close();
            if (wdf != null)
                wdf.Close();
            return responseStr;
        }
@@ -268,7 +274,8 @@
                        {
                            colmn.Visible = true;
                            colmn.OptionsColumn.ReadOnly = false;
                        };
                        }
                        ;
                        if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
                        {
                            colmn.Visible = !isEdt;
@@ -458,7 +465,7 @@
                        {
                            var txt = colType as RadioGroup;
                            if (txt != null)
                                txt.SelectedIndex =int.Parse( strVal);
                                txt.SelectedIndex = int.Parse(strVal);
                            txt.ReadOnly = isEdt;
                            continue;
                        }
@@ -1933,7 +1940,8 @@
                {
                    int _handle = gridView1.FocusedRowHandle;
                    bool _bl = xtraTabControl1.TabPages[0].PageEnabled;
                    if (_bl == false) { return; };
                    if (_bl == false) { return; }
                    ;
                    if (_handle < 0)
                    {
                        xtraTabControl1.SelectedTabPageIndex = -1;
@@ -2477,6 +2485,8 @@
        委外退料入库检,
        cqcjyes,//重检方案
        cqcjno,//重检方案
        产线称重,
        iqc称重,
    }
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -77,8 +77,21 @@
        /// <exception cref="NotImplementedException"></exception>
        private void BtnWeight_ItemClick(object sender, ItemClickEventArgs e)
        {
            var frm = new Frm_Work09();
            frm.Show();
            bool isOpen = false;
            foreach (Form form in Application.OpenForms)
            {
                if (form is Frm_Work09)
                {
                    isOpen = true;
                    form.Activate(); // 激活已存在的窗体
                    break;
                }
            }
            if (!isOpen)
            {
                var form = new Frm_Work09(QcSeason.iqc称重.ToString());
                form.Show();
            }
        }
        /// <summary>
@@ -439,7 +452,7 @@
                lst.Add(btnShouHouFchk.Name);
                lst.Add(btnGongZi.Name);
                lst.Add(btnLianBan.Name);
                lst.Add(btnEsc.Name);
               // lst.Add(btnEsc.Name);
                lst.Add(btnGx.Name);
                _enabledBtn(lst);
                this.currentAction = "esc";
@@ -491,7 +504,7 @@
                    lst.Add(btnOut.Name);
                    lst.Add(btnGongZi.Name);
                    lst.Add(btnLianBan.Name);
                    lst.Add(btnEsc.Name);
                   // lst.Add(btnEsc.Name);
                    lst.Add(btnGx.Name);
                    _enabledBtn(lst);
                }
@@ -517,8 +530,8 @@
            lst.Add(btnHelp.Name);
            lst.Add(btnLayout.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnLog.Name);
            lst.Add(btnWeight.Name);
            _enabledBtn(lst);
            this.currentAction = "edit";
            if (btnEdtClick != null) btnEdtClick(this, e);
@@ -546,6 +559,7 @@
            lst.Add(btnHelp.Name);
            lst.Add(btnLayout.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnWeight.Name);
            _enabledBtn(lst);
            this.currentAction = "add";
            if (btnAddClick != null) btnAddClick(this, e);