iqc
lu
2025-04-21 c3ebc2116abc274eb2220e7a24c4ca03acad3a1d
iqc
已添加3个文件
已重命名1个文件
已修改9个文件
已删除2个文件
2957 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs 287 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs 689 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs 137 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs 870 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs 262 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.resx 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.Designer.cs 236 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 243 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/licenses.licx 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/chartswitchrowcolumn_16x16.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -55,7 +55,6 @@
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ftwoChecked = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,8 +62,6 @@
            this.gv_createName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ftwoCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ftwoCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
@@ -74,31 +71,24 @@
            this.txt_sampleSizeNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_sampleSizeName = new DevExpress.XtraEditors.TextEdit();
            this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
            this.txt_ftwoCheckdate = new DevExpress.XtraEditors.TextEdit();
            this.txt_memo = new DevExpress.XtraEditors.TextEdit();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
            this.txt_ftwoCheckor = new DevExpress.XtraEditors.TextEdit();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
            this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
            this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
            this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -215,6 +205,7 @@
            this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -237,31 +228,24 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -282,6 +266,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.advBandedGridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -322,6 +307,7 @@
            // split1
            // 
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
@@ -334,7 +320,8 @@
            // 
            // split1.Panel2
            // 
             this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1746, 570);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
@@ -356,7 +343,6 @@
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_guid,
            this.gv_isenabled,
            this.gv_ftwoChecked,
            this.gv_foneChecked,
            this.gv_fversion,
            this.gv_sampleSizeNo,
@@ -364,8 +350,6 @@
            this.gv_createName,
            this.gv_foneCheckor,
            this.gv_foneCheckdate,
            this.gv_ftwoCheckor,
            this.gv_ftwoCheckdate,
            this.gv_memo});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
@@ -388,28 +372,13 @@
            // gv_isenabled
            // 
            this.gv_isenabled.AppearanceCell.Options.UseFont = true;
            this.gv_isenabled.Caption = "是否有效";
            this.gv_isenabled.Caption = "是否可用";
            this.gv_isenabled.FieldName = "isenabled";
            this.gv_isenabled.MinWidth = 50;
            this.gv_isenabled.Name = "gv_isenabled";
            this.gv_isenabled.OptionsColumn.AllowEdit = false;
            this.gv_isenabled.Tag = "query_a.ISENABLED";
            this.gv_isenabled.Visible = true;
            this.gv_isenabled.VisibleIndex = 0;
            this.gv_isenabled.Width = 94;
            //
            // gv_ftwoChecked
            //
            this.gv_ftwoChecked.AppearanceCell.Options.UseFont = true;
            this.gv_ftwoChecked.Caption = "批准标记";
            this.gv_ftwoChecked.FieldName = "ftwoChecked";
            this.gv_ftwoChecked.MinWidth = 50;
            this.gv_ftwoChecked.Name = "gv_ftwoChecked";
            this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
            this.gv_ftwoChecked.Tag = "query_a.FTWO_CHECKED";
            this.gv_ftwoChecked.Visible = true;
            this.gv_ftwoChecked.VisibleIndex = 1;
            this.gv_ftwoChecked.Width = 94;
            // 
            // gv_foneChecked
            // 
@@ -421,7 +390,7 @@
            this.gv_foneChecked.OptionsColumn.AllowEdit = false;
            this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
            this.gv_foneChecked.Visible = true;
            this.gv_foneChecked.VisibleIndex = 2;
            this.gv_foneChecked.VisibleIndex = 0;
            this.gv_foneChecked.Width = 94;
            // 
            // gv_fversion
@@ -433,8 +402,6 @@
            this.gv_fversion.Name = "gv_fversion";
            this.gv_fversion.OptionsColumn.AllowEdit = false;
            this.gv_fversion.Tag = "query_a.FVERSION";
            this.gv_fversion.Visible = true;
            this.gv_fversion.VisibleIndex = 3;
            this.gv_fversion.Width = 94;
            // 
            // gv_sampleSizeNo
@@ -447,7 +414,7 @@
            this.gv_sampleSizeNo.OptionsColumn.AllowEdit = false;
            this.gv_sampleSizeNo.Tag = "query_a.SAMPLE_SIZE_NO";
            this.gv_sampleSizeNo.Visible = true;
            this.gv_sampleSizeNo.VisibleIndex = 4;
            this.gv_sampleSizeNo.VisibleIndex = 1;
            this.gv_sampleSizeNo.Width = 150;
            // 
            // gv_sampleSizeName
@@ -460,7 +427,7 @@
            this.gv_sampleSizeName.OptionsColumn.AllowEdit = false;
            this.gv_sampleSizeName.Tag = "query_a.SAMPLE_SIZE_NAME";
            this.gv_sampleSizeName.Visible = true;
            this.gv_sampleSizeName.VisibleIndex = 5;
            this.gv_sampleSizeName.VisibleIndex = 2;
            this.gv_sampleSizeName.Width = 94;
            // 
            // gv_createName
@@ -473,7 +440,7 @@
            this.gv_createName.OptionsColumn.AllowEdit = false;
            this.gv_createName.Tag = "query_a.CREATE_NAME";
            this.gv_createName.Visible = true;
            this.gv_createName.VisibleIndex = 6;
            this.gv_createName.VisibleIndex = 4;
            this.gv_createName.Width = 94;
            // 
            // gv_foneCheckor
@@ -486,7 +453,7 @@
            this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
            this.gv_foneCheckor.Visible = true;
            this.gv_foneCheckor.VisibleIndex = 7;
            this.gv_foneCheckor.VisibleIndex = 5;
            this.gv_foneCheckor.Width = 94;
            // 
            // gv_foneCheckdate
@@ -499,34 +466,8 @@
            this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
            this.gv_foneCheckdate.Visible = true;
            this.gv_foneCheckdate.VisibleIndex = 8;
            this.gv_foneCheckdate.VisibleIndex = 6;
            this.gv_foneCheckdate.Width = 200;
            //
            // gv_ftwoCheckor
            //
            this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
            this.gv_ftwoCheckor.Caption = "批准人";
            this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
            this.gv_ftwoCheckor.MinWidth = 50;
            this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
            this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
            this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
            this.gv_ftwoCheckor.Visible = true;
            this.gv_ftwoCheckor.VisibleIndex = 9;
            this.gv_ftwoCheckor.Width = 94;
            //
            // gv_ftwoCheckdate
            //
            this.gv_ftwoCheckdate.AppearanceCell.Options.UseFont = true;
            this.gv_ftwoCheckdate.Caption = "批准日期";
            this.gv_ftwoCheckdate.FieldName = "ftwoCheckdate";
            this.gv_ftwoCheckdate.MinWidth = 50;
            this.gv_ftwoCheckdate.Name = "gv_ftwoCheckdate";
            this.gv_ftwoCheckdate.OptionsColumn.AllowEdit = false;
            this.gv_ftwoCheckdate.Tag = "query_a.FTWO_CHECKDATE";
            this.gv_ftwoCheckdate.Visible = true;
            this.gv_ftwoCheckdate.VisibleIndex = 10;
            this.gv_ftwoCheckdate.Width = 200;
            // 
            // gv_memo
            // 
@@ -538,7 +479,7 @@
            this.gv_memo.OptionsColumn.AllowEdit = false;
            this.gv_memo.Tag = "query_a.MEMO";
            this.gv_memo.Visible = true;
            this.gv_memo.VisibleIndex = 11;
            this.gv_memo.VisibleIndex = 3;
            this.gv_memo.Width = 94;
            // 
            // pageBar1
@@ -565,7 +506,7 @@
            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx1.Horizontal = false;
            this.splitMx1.Location = new System.Drawing.Point(0, 0);
             this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Name = "splitMx1";
            // 
            // splitMx1.Panel1
            // 
@@ -576,6 +517,7 @@
            // 
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1746, 570);
            this.splitMx1.TabIndex = 0;
            // 
@@ -585,20 +527,17 @@
            this.layoutMx1.Controls.Add(this.txt_sampleSizeNo);
            this.layoutMx1.Controls.Add(this.txt_sampleSizeName);
            this.layoutMx1.Controls.Add(this.txt_fversion);
            this.layoutMx1.Controls.Add(this.txt_ftwoCheckdate);
            this.layoutMx1.Controls.Add(this.txt_memo);
            this.layoutMx1.Controls.Add(this.txt_createBy);
            this.layoutMx1.Controls.Add(this.txt_foneCheckdate);
            this.layoutMx1.Controls.Add(this.txt_ftwoCheckor);
            this.layoutMx1.Controls.Add(this.txt_createDate);
            this.layoutMx1.Controls.Add(this.txt_foneCheckor);
            this.layoutMx1.Controls.Add(this.txt_foneChecked);
            this.layoutMx1.Controls.Add(this.txt_ftwoChecked);
            this.layoutMx1.Controls.Add(this.txt_isenabled);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem14,
            this.layoutControlItem13});
            this.layoutControlItem6});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(898, 472, 812, 500);
@@ -617,7 +556,7 @@
            // 
            // txt_sampleSizeNo
            // 
            this.txt_sampleSizeNo.Location = new System.Drawing.Point(84, 12);
            this.txt_sampleSizeNo.Location = new System.Drawing.Point(84, 8);
            this.txt_sampleSizeNo.Name = "txt_sampleSizeNo";
            this.txt_sampleSizeNo.Properties.Appearance.Options.UseFont = true;
            this.txt_sampleSizeNo.Size = new System.Drawing.Size(350, 24);
@@ -626,7 +565,7 @@
            // 
            // txt_sampleSizeName
            // 
            this.txt_sampleSizeName.Location = new System.Drawing.Point(84, 40);
            this.txt_sampleSizeName.Location = new System.Drawing.Point(84, 36);
            this.txt_sampleSizeName.Name = "txt_sampleSizeName";
            this.txt_sampleSizeName.Properties.Appearance.Options.UseFont = true;
            this.txt_sampleSizeName.Size = new System.Drawing.Size(350, 24);
@@ -635,26 +574,16 @@
            // 
            // txt_fversion
            // 
            this.txt_fversion.Location = new System.Drawing.Point(510, 68);
            this.txt_fversion.Location = new System.Drawing.Point(510, 64);
            this.txt_fversion.Name = "txt_fversion";
            this.txt_fversion.Properties.Appearance.Options.UseFont = true;
            this.txt_fversion.Size = new System.Drawing.Size(350, 24);
            this.txt_fversion.StyleController = this.layoutMx1;
            this.txt_fversion.TabIndex = 273;
            // 
            // txt_ftwoCheckdate
            //
            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(936, 40);
            this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
            this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
            this.txt_ftwoCheckdate.Size = new System.Drawing.Size(350, 24);
            this.txt_ftwoCheckdate.StyleController = this.layoutMx1;
            this.txt_ftwoCheckdate.TabIndex = 262;
            this.txt_ftwoCheckdate.Tag = "readOnly";
            //
            // txt_memo
            // 
            this.txt_memo.Location = new System.Drawing.Point(84, 68);
            this.txt_memo.Location = new System.Drawing.Point(84, 64);
            this.txt_memo.Name = "txt_memo";
            this.txt_memo.Properties.Appearance.Options.UseFont = true;
            this.txt_memo.Size = new System.Drawing.Size(350, 24);
@@ -663,7 +592,7 @@
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(510, 12);
            this.txt_createBy.Location = new System.Drawing.Point(510, 8);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
            this.txt_createBy.Size = new System.Drawing.Size(350, 24);
@@ -673,27 +602,17 @@
            // 
            // txt_foneCheckdate
            // 
            this.txt_foneCheckdate.Location = new System.Drawing.Point(1362, 40);
            this.txt_foneCheckdate.Location = new System.Drawing.Point(936, 36);
            this.txt_foneCheckdate.Name = "txt_foneCheckdate";
            this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
            this.txt_foneCheckdate.Size = new System.Drawing.Size(351, 24);
            this.txt_foneCheckdate.Size = new System.Drawing.Size(350, 24);
            this.txt_foneCheckdate.StyleController = this.layoutMx1;
            this.txt_foneCheckdate.TabIndex = 247;
            this.txt_foneCheckdate.Tag = "readOnly";
            // 
            // txt_ftwoCheckor
            //
            this.txt_ftwoCheckor.Location = new System.Drawing.Point(936, 12);
            this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
            this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
            this.txt_ftwoCheckor.Size = new System.Drawing.Size(350, 24);
            this.txt_ftwoCheckor.StyleController = this.layoutMx1;
            this.txt_ftwoCheckor.TabIndex = 258;
            this.txt_ftwoCheckor.Tag = "readOnly";
            //
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(510, 40);
            this.txt_createDate.Location = new System.Drawing.Point(510, 36);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
            this.txt_createDate.Size = new System.Drawing.Size(350, 24);
@@ -703,38 +622,29 @@
            // 
            // txt_foneCheckor
            // 
            this.txt_foneCheckor.Location = new System.Drawing.Point(1362, 12);
            this.txt_foneCheckor.Location = new System.Drawing.Point(936, 8);
            this.txt_foneCheckor.Name = "txt_foneCheckor";
            this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
            this.txt_foneCheckor.Size = new System.Drawing.Size(351, 24);
            this.txt_foneCheckor.Size = new System.Drawing.Size(350, 24);
            this.txt_foneCheckor.StyleController = this.layoutMx1;
            this.txt_foneCheckor.TabIndex = 243;
            this.txt_foneCheckor.Tag = "readOnly";
            // 
            // txt_foneChecked
            // 
            this.txt_foneChecked.Location = new System.Drawing.Point(1290, 68);
            this.txt_foneChecked.Location = new System.Drawing.Point(864, 64);
            this.txt_foneChecked.Name = "txt_foneChecked";
            this.txt_foneChecked.Properties.Caption = "审核时间";
            this.txt_foneChecked.Size = new System.Drawing.Size(423, 24);
            this.txt_foneChecked.Size = new System.Drawing.Size(422, 24);
            this.txt_foneChecked.StyleController = this.layoutMx1;
            this.txt_foneChecked.TabIndex = 274;
            // 
            // txt_ftwoChecked
            //
            this.txt_ftwoChecked.Location = new System.Drawing.Point(864, 68);
            this.txt_ftwoChecked.Name = "txt_ftwoChecked";
            this.txt_ftwoChecked.Properties.Caption = "批准标记";
            this.txt_ftwoChecked.Size = new System.Drawing.Size(422, 24);
            this.txt_ftwoChecked.StyleController = this.layoutMx1;
            this.txt_ftwoChecked.TabIndex = 275;
            //
            // txt_isenabled
            // 
            this.txt_isenabled.Location = new System.Drawing.Point(874, 97);
            this.txt_isenabled.Location = new System.Drawing.Point(438, 64);
            this.txt_isenabled.Name = "txt_isenabled";
            this.txt_isenabled.Properties.Caption = "可用标识";
            this.txt_isenabled.Size = new System.Drawing.Size(427, 24);
            this.txt_isenabled.Size = new System.Drawing.Size(422, 24);
            this.txt_isenabled.StyleController = this.layoutMx1;
            this.txt_isenabled.TabIndex = 276;
            // 
@@ -750,17 +660,16 @@
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
            // 
            // layoutControlItem13
            // layoutControlItem6
            // 
            this.layoutControlItem13.Control = this.txt_isenabled;
            this.layoutControlItem13.Location = new System.Drawing.Point(862, 85);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem13.Size = new System.Drawing.Size(431, 43);
            this.layoutControlItem13.Text = "可用标识";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            this.layoutControlItem6.Control = this.txt_fversion;
            this.layoutControlItem6.Location = new System.Drawing.Point(426, 56);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem6.Text = "版本号";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
            // Root
            // 
@@ -772,13 +681,10 @@
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem5,
            this.layoutControlItem6,
            this.layoutControlItem7,
            this.layoutControlItem8,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem11,
            this.layoutControlItem12});
            this.layoutControlItem13});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -843,7 +749,7 @@
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem4.Text = "制作人";
            this.layoutControlItem4.Text = "制作人员";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem5
@@ -857,82 +763,38 @@
            this.layoutControlItem5.Text = "制作时间";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_fversion;
            this.layoutControlItem6.Location = new System.Drawing.Point(426, 56);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem6.Text = "版本号";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_ftwoCheckor;
            this.layoutControlItem7.Location = new System.Drawing.Point(852, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem7.Text = "批准人";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.txt_ftwoCheckdate;
            this.layoutControlItem8.Location = new System.Drawing.Point(852, 28);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem8.Text = "批准时间";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_foneCheckor;
            this.layoutControlItem9.Location = new System.Drawing.Point(1278, 0);
            this.layoutControlItem9.Location = new System.Drawing.Point(852, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(427, 28);
            this.layoutControlItem9.Text = "审核人";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_foneCheckdate;
            this.layoutControlItem10.Location = new System.Drawing.Point(1278, 28);
            this.layoutControlItem10.Location = new System.Drawing.Point(852, 28);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(427, 28);
            this.layoutControlItem10.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_foneChecked;
            this.layoutControlItem11.Location = new System.Drawing.Point(1278, 56);
            this.layoutControlItem11.Location = new System.Drawing.Point(852, 56);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(427, 28);
            this.layoutControlItem11.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_ftwoChecked;
            this.layoutControlItem12.Location = new System.Drawing.Point(852, 56);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem12.Text = "批准标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            // 
            // tabMx
            // 
@@ -1332,7 +1194,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1744, 378);
            this.tabMxPage2.Size = new System.Drawing.Size(1744, 426);
            this.tabMxPage2.Text = "抽样方案";
            // 
            // gcMx2
@@ -1344,7 +1206,7 @@
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemComboBox1,
            this.repositoryItemButtonEdit2});
            this.gcMx2.Size = new System.Drawing.Size(1744, 378);
            this.gcMx2.Size = new System.Drawing.Size(1744, 426);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2,
@@ -2189,6 +2051,18 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_isenabled;
            this.layoutControlItem13.Location = new System.Drawing.Point(426, 56);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem13.Size = new System.Drawing.Size(426, 28);
            this.layoutControlItem13.Text = "可用标识";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            //
            // Frm_MesQmAql1
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2221,31 +2095,24 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2266,6 +2133,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.advBandedGridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            this.ResumeLayout(false);
        }
@@ -2279,7 +2147,6 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoChecked;
        private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;
        private DevExpress.XtraGrid.Columns.GridColumn gv_sampleSizeNo;
@@ -2287,15 +2154,11 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_createName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;
        private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckdate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckor;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckdate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraEditors.TextEdit txt_fversion;
        private DevExpress.XtraEditors.TextEdit txt_ftwoCheckdate;
        private DevExpress.XtraEditors.TextEdit txt_ftwoCheckor;
        private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
        private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
        private DevExpress.XtraEditors.TextEdit txt_memo;
@@ -2306,19 +2169,13 @@
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
        private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraEditors.CheckEdit txt_isenabled;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -2435,8 +2292,10 @@
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn22;
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -54,7 +54,6 @@
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -73,40 +72,6 @@
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
        /// <summary>
        /// æ‰¹å‡†
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    gridView1.SetFocusedRowCellValue("ftwoChecked", true);
                    gridView1.SetFocusedRowCellValue("isenabled", true);
                    gridView1.SetFocusedRowCellValue("ftwoCheckor", "已批准");
                    gridView1.SetFocusedRowCellValue("ftwoCheckdate", DateTime.Now.ToString());
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        ///     åå®¡æ ¸
@@ -175,10 +140,11 @@
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    {
                        getPageList(this.pageBar1.CurrentPage);
                    }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -41,11 +41,6 @@
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -54,16 +49,12 @@
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ftwoChecked = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ftwoCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -74,6 +65,7 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
            this.btnCopy = new DevExpress.XtraEditors.SimpleButton();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
            this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
@@ -81,26 +73,23 @@
            this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_memo = new DevExpress.XtraEditors.TextEdit();
            this.txt_ftwoCheckor = new DevExpress.XtraEditors.TextEdit();
            this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
            this.txt_ftwoCheckdate = new DevExpress.XtraEditors.TextEdit();
            this.txt_gg = new DevExpress.XtraEditors.TextEdit();
            this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
            this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
            this.txt_ftype = new DevExpress.XtraEditors.TextEdit();
            this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -128,20 +117,6 @@
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.xtraTabPageCopy = new DevExpress.XtraTab.XtraTabPage();
            this.gridControl2 = new DevExpress.XtraGrid.GridControl();
            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -167,26 +142,23 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -199,12 +171,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.xtraTabPageCopy.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -246,6 +212,7 @@
            // split1
            // 
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
@@ -258,7 +225,8 @@
            // 
            // split1.Panel2
            // 
             this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1127, 570);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
@@ -283,16 +251,12 @@
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_isenabled,
            this.gv_foneChecked,
            this.gv_ftwoChecked,
            this.gv_fversion,
            this.gridColumn7,
            this.gv_itemNo,
            this.gridColumn3,
            this.gridColumn2,
            this.gv_foneCheckor,
            this.gv_foneCheckdate,
            this.gv_ftwoCheckor,
            this.gridColumn10,
            this.gridColumn1,
            this.gridColumn4,
            this.gv_memo,
@@ -317,8 +281,6 @@
            this.gv_isenabled.OptionsColumn.AllowEdit = false;
            this.gv_isenabled.Tag = "query_a.ISENABLED";
            this.gv_isenabled.UnboundDataType = typeof(bool);
            this.gv_isenabled.Visible = true;
            this.gv_isenabled.VisibleIndex = 0;
            this.gv_isenabled.Width = 50;
            // 
            // gv_foneChecked
@@ -333,36 +295,8 @@
            this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
            this.gv_foneChecked.UnboundDataType = typeof(bool);
            this.gv_foneChecked.Visible = true;
            this.gv_foneChecked.VisibleIndex = 1;
            this.gv_foneChecked.VisibleIndex = 0;
            this.gv_foneChecked.Width = 50;
            //
            // gv_ftwoChecked
            //
            this.gv_ftwoChecked.AppearanceCell.Options.UseFont = true;
            this.gv_ftwoChecked.Caption = "批准标记";
            this.gv_ftwoChecked.FieldName = "ftwoChecked";
            this.gv_ftwoChecked.MaxWidth = 50;
            this.gv_ftwoChecked.MinWidth = 50;
            this.gv_ftwoChecked.Name = "gv_ftwoChecked";
            this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
            this.gv_ftwoChecked.Tag = "query_a.FTWO_CHECKED";
            this.gv_ftwoChecked.UnboundDataType = typeof(bool);
            this.gv_ftwoChecked.Visible = true;
            this.gv_ftwoChecked.VisibleIndex = 2;
            this.gv_ftwoChecked.Width = 50;
            //
            // gv_fversion
            //
            this.gv_fversion.AppearanceCell.Options.UseFont = true;
            this.gv_fversion.Caption = "版本";
            this.gv_fversion.FieldName = "fversion";
            this.gv_fversion.MinWidth = 50;
            this.gv_fversion.Name = "gv_fversion";
            this.gv_fversion.OptionsColumn.AllowEdit = false;
            this.gv_fversion.Tag = "query_a.FVERSION";
            this.gv_fversion.Visible = true;
            this.gv_fversion.VisibleIndex = 3;
            this.gv_fversion.Width = 94;
            // 
            // gridColumn7
            // 
@@ -373,7 +307,7 @@
            this.gridColumn7.OptionsColumn.AllowEdit = false;
            this.gridColumn7.Tag = "query_a.ITEM_ID";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 4;
            this.gridColumn7.VisibleIndex = 1;
            this.gridColumn7.Width = 94;
            // 
            // gv_itemNo
@@ -386,7 +320,7 @@
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_b.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 5;
            this.gv_itemNo.VisibleIndex = 2;
            this.gv_itemNo.Width = 150;
            // 
            // gridColumn3
@@ -398,7 +332,7 @@
            this.gridColumn3.OptionsColumn.AllowEdit = false;
            this.gridColumn3.Tag = "query_b.item_name";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.Width = 250;
            // 
            // gridColumn2
@@ -411,7 +345,7 @@
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Tag = "query_b.item_model";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.VisibleIndex = 4;
            this.gridColumn2.Width = 100;
            // 
            // gv_foneCheckor
@@ -424,7 +358,7 @@
            this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
            this.gv_foneCheckor.Visible = true;
            this.gv_foneCheckor.VisibleIndex = 8;
            this.gv_foneCheckor.VisibleIndex = 5;
            this.gv_foneCheckor.Width = 94;
            // 
            // gv_foneCheckdate
@@ -437,31 +371,8 @@
            this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
            this.gv_foneCheckdate.Visible = true;
            this.gv_foneCheckdate.VisibleIndex = 9;
            this.gv_foneCheckdate.VisibleIndex = 6;
            this.gv_foneCheckdate.Width = 120;
            //
            // gv_ftwoCheckor
            //
            this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
            this.gv_ftwoCheckor.Caption = "批准人";
            this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
            this.gv_ftwoCheckor.MinWidth = 50;
            this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
            this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
            this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
            this.gv_ftwoCheckor.Visible = true;
            this.gv_ftwoCheckor.VisibleIndex = 10;
            this.gv_ftwoCheckor.Width = 94;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "批准时间";
            this.gridColumn10.FieldName = "ftwoCheckdate";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 11;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn1
            // 
@@ -472,7 +383,7 @@
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Tag = "query_a.CREATE_BY";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 12;
            this.gridColumn1.VisibleIndex = 7;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn4
@@ -484,7 +395,7 @@
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Tag = "query_a.CREATE_DATE";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 13;
            this.gridColumn4.VisibleIndex = 8;
            this.gridColumn4.Width = 180;
            // 
            // gv_memo
@@ -497,7 +408,7 @@
            this.gv_memo.OptionsColumn.AllowEdit = false;
            this.gv_memo.Tag = "query_a.MEMO";
            this.gv_memo.Visible = true;
            this.gv_memo.VisibleIndex = 14;
            this.gv_memo.VisibleIndex = 9;
            this.gv_memo.Width = 150;
            // 
            // gridColumn16
@@ -517,7 +428,7 @@
            this.gridColumn8.OptionsColumn.AllowEdit = false;
            this.gridColumn8.Tag = "org.fnumber";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 15;
            this.gridColumn8.VisibleIndex = 10;
            this.gridColumn8.Width = 250;
            // 
            // gridColumn18
@@ -527,7 +438,7 @@
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 16;
            this.gridColumn18.VisibleIndex = 11;
            this.gridColumn18.Width = 94;
            // 
            // pageBar1
@@ -554,7 +465,7 @@
            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx1.Horizontal = false;
            this.splitMx1.Location = new System.Drawing.Point(0, 0);
             this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Name = "splitMx1";
            // 
            // splitMx1.Panel1
            // 
@@ -565,12 +476,14 @@
            // 
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1127, 570);
            this.splitMx1.SplitterPosition = 114;
            this.splitMx1.SplitterPosition = 107;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.btnCopy);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
            this.layoutMx1.Controls.Add(this.txt_itemId);
@@ -578,22 +491,31 @@
            this.layoutMx1.Controls.Add(this.txt_foneCheckor);
            this.layoutMx1.Controls.Add(this.txt_itemNo);
            this.layoutMx1.Controls.Add(this.txt_memo);
            this.layoutMx1.Controls.Add(this.txt_ftwoCheckor);
            this.layoutMx1.Controls.Add(this.txt_fversion);
            this.layoutMx1.Controls.Add(this.txt_ftwoCheckdate);
            this.layoutMx1.Controls.Add(this.txt_gg);
            this.layoutMx1.Controls.Add(this.txt_ftwoChecked);
            this.layoutMx1.Controls.Add(this.txt_foneChecked);
            this.layoutMx1.Controls.Add(this.txt_ftype);
            this.layoutMx1.Controls.Add(this.txt_isenabled);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem13});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(852, 71, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(599, 447, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1127, 114);
            this.layoutMx1.Size = new System.Drawing.Size(1127, 107);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "dataLayoutControl1";
            //
            // btnCopy
            //
            this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.chartswitchrowcolumn_16x16;
            this.btnCopy.Location = new System.Drawing.Point(554, 43);
            this.btnCopy.Name = "btnCopy";
            this.btnCopy.Size = new System.Drawing.Size(131, 27);
            this.btnCopy.StyleController = this.layoutMx1;
            this.btnCopy.TabIndex = 388;
            this.btnCopy.Tag = "gvBtnAlawys";
            this.btnCopy.Text = "复制到其它物料";
            // 
            // lbGuid
            // 
@@ -606,117 +528,95 @@
            // txt_fSubsidiary
            // 
            this.txt_fSubsidiary.IsReadly = false;
            this.txt_fSubsidiary.Location = new System.Drawing.Point(96, 12);
            this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
            this.txt_fSubsidiary.Size = new System.Drawing.Size(188, 24);
            this.txt_fSubsidiary.Size = new System.Drawing.Size(195, 24);
            this.txt_fSubsidiary.TabIndex = 383;
            // 
            // txt_itemId
            // 
            this.txt_itemId.IsReadly = false;
            this.txt_itemId.Location = new System.Drawing.Point(96, 43);
            this.txt_itemId.Location = new System.Drawing.Point(84, 43);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Size = new System.Drawing.Size(188, 24);
            this.txt_itemId.Size = new System.Drawing.Size(195, 24);
            this.txt_itemId.TabIndex = 380;
            this.txt_itemId.Tag = "no";
            // 
            // txt_foneCheckdate
            // 
            this.txt_foneCheckdate.Location = new System.Drawing.Point(926, 43);
            this.txt_foneCheckdate.Location = new System.Drawing.Point(897, 43);
            this.txt_foneCheckdate.Name = "txt_foneCheckdate";
            this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
            this.txt_foneCheckdate.Size = new System.Drawing.Size(189, 24);
            this.txt_foneCheckdate.Size = new System.Drawing.Size(197, 24);
            this.txt_foneCheckdate.StyleController = this.layoutMx1;
            this.txt_foneCheckdate.TabIndex = 267;
            this.txt_foneCheckdate.Tag = "readOnly";
            // 
            // txt_foneCheckor
            // 
            this.txt_foneCheckor.Location = new System.Drawing.Point(926, 12);
            this.txt_foneCheckor.Location = new System.Drawing.Point(897, 12);
            this.txt_foneCheckor.Name = "txt_foneCheckor";
            this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
            this.txt_foneCheckor.Size = new System.Drawing.Size(189, 24);
            this.txt_foneCheckor.Size = new System.Drawing.Size(197, 24);
            this.txt_foneCheckor.StyleController = this.layoutMx1;
            this.txt_foneCheckor.TabIndex = 262;
            this.txt_foneCheckor.Tag = "readOnly";
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(372, 43);
            this.txt_itemNo.Location = new System.Drawing.Point(355, 12);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(189, 24);
            this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 370;
            this.txt_itemNo.Tag = "readOnly";
            // 
            // txt_memo
            // 
            this.txt_memo.Location = new System.Drawing.Point(96, 74);
            this.txt_memo.Location = new System.Drawing.Point(84, 74);
            this.txt_memo.Name = "txt_memo";
            this.txt_memo.Properties.Appearance.Options.UseFont = true;
            this.txt_memo.Size = new System.Drawing.Size(188, 24);
            this.txt_memo.Size = new System.Drawing.Size(466, 24);
            this.txt_memo.StyleController = this.layoutMx1;
            this.txt_memo.TabIndex = 219;
            // 
            // txt_ftwoCheckor
            //
            this.txt_ftwoCheckor.Location = new System.Drawing.Point(649, 12);
            this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
            this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
            this.txt_ftwoCheckor.Size = new System.Drawing.Size(189, 24);
            this.txt_ftwoCheckor.StyleController = this.layoutMx1;
            this.txt_ftwoCheckor.TabIndex = 280;
            this.txt_ftwoCheckor.Tag = "readOnly";
            //
            // txt_fversion
            //
            this.txt_fversion.Location = new System.Drawing.Point(372, 12);
            this.txt_fversion.Name = "txt_fversion";
            this.txt_fversion.Properties.Appearance.Options.UseFont = true;
            this.txt_fversion.Size = new System.Drawing.Size(189, 24);
            this.txt_fversion.StyleController = this.layoutMx1;
            this.txt_fversion.TabIndex = 298;
            this.txt_fversion.Tag = "readOnly";
            //
            // txt_ftwoCheckdate
            //
            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(649, 43);
            this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
            this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
            this.txt_ftwoCheckdate.Size = new System.Drawing.Size(189, 24);
            this.txt_ftwoCheckdate.StyleController = this.layoutMx1;
            this.txt_ftwoCheckdate.TabIndex = 285;
            this.txt_ftwoCheckdate.Tag = "readOnly";
            //
            // txt_gg
            // 
            this.txt_gg.Location = new System.Drawing.Point(372, 74);
            this.txt_gg.Location = new System.Drawing.Point(355, 43);
            this.txt_gg.Name = "txt_gg";
            this.txt_gg.Size = new System.Drawing.Size(189, 24);
            this.txt_gg.Size = new System.Drawing.Size(195, 24);
            this.txt_gg.StyleController = this.layoutMx1;
            this.txt_gg.TabIndex = 384;
            this.txt_gg.Tag = "readOnly";
            // 
            // txt_ftwoChecked
            //
            this.txt_ftwoChecked.Location = new System.Drawing.Point(565, 74);
            this.txt_ftwoChecked.Name = "txt_ftwoChecked";
            this.txt_ftwoChecked.Properties.Caption = "批准标识";
            this.txt_ftwoChecked.Size = new System.Drawing.Size(273, 24);
            this.txt_ftwoChecked.StyleController = this.layoutMx1;
            this.txt_ftwoChecked.TabIndex = 385;
            this.txt_ftwoChecked.Tag = "readOnly";
            //
            // txt_foneChecked
            // 
            this.txt_foneChecked.Location = new System.Drawing.Point(842, 74);
            this.txt_foneChecked.Location = new System.Drawing.Point(825, 74);
            this.txt_foneChecked.Name = "txt_foneChecked";
            this.txt_foneChecked.Properties.Caption = "审核标识";
            this.txt_foneChecked.Size = new System.Drawing.Size(273, 24);
            this.txt_foneChecked.Size = new System.Drawing.Size(269, 24);
            this.txt_foneChecked.StyleController = this.layoutMx1;
            this.txt_foneChecked.TabIndex = 386;
            this.txt_foneChecked.Tag = "readOnly";
            //
            // txt_ftype
            //
            this.txt_ftype.Location = new System.Drawing.Point(626, 12);
            this.txt_ftype.Name = "txt_ftype";
            this.txt_ftype.Size = new System.Drawing.Size(195, 24);
            this.txt_ftype.StyleController = this.layoutMx1;
            this.txt_ftype.TabIndex = 389;
            this.txt_ftype.Tag = "readOnly";
            //
            // txt_isenabled
            //
            this.txt_isenabled.Location = new System.Drawing.Point(554, 74);
            this.txt_isenabled.Name = "txt_isenabled";
            this.txt_isenabled.Properties.Caption = "可用标识";
            this.txt_isenabled.Size = new System.Drawing.Size(267, 24);
            this.txt_isenabled.StyleController = this.layoutMx1;
            this.txt_isenabled.TabIndex = 390;
            // 
            // layoutControlItem13
            // 
@@ -736,17 +636,16 @@
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1,
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem6,
            this.layoutControlItem9,
            this.layoutControlItem2,
            this.layoutControlItem10,
            this.layoutControlItem11,
            this.layoutControlItem12,
            this.layoutControlItem2,
            this.layoutControlItem5,
            this.layoutControlItem3,
            this.layoutControlItem7,
            this.layoutControlItem8,
            this.layoutControlItem7});
            this.layoutControlItem14,
            this.layoutControlItem5});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -772,7 +671,7 @@
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1127, 114);
            this.Root.Size = new System.Drawing.Size(1106, 113);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -780,19 +679,9 @@
            this.layoutControlItem1.Control = this.txt_fSubsidiary;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem1.Text = "选择组织";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_ftwoCheckor;
            this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
            this.layoutControlItem3.Text = "批准人";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 18);
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem4
            // 
@@ -800,107 +689,110 @@
            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(276, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem4.Text = "选择物料";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 18);
            //
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_ftwoCheckdate;
            this.layoutControlItem6.Location = new System.Drawing.Point(553, 31);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(277, 31);
            this.layoutControlItem6.Text = "批准日期";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 18);
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.txt_ftwoChecked;
            this.layoutControlItem9.Location = new System.Drawing.Point(553, 62);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(277, 32);
            this.layoutControlItem9.Text = "批准标识";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem9.TextVisible = false;
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_foneCheckor;
            this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
            this.layoutControlItem10.Text = "审核人";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_foneCheckdate;
            this.layoutControlItem11.Location = new System.Drawing.Point(830, 31);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(277, 31);
            this.layoutControlItem11.Text = "审核时间";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_foneChecked;
            this.layoutControlItem12.Location = new System.Drawing.Point(830, 62);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(277, 32);
            this.layoutControlItem12.Text = "审核标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_memo;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem2.Size = new System.Drawing.Size(542, 31);
            this.layoutControlItem2.Text = "备注";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 18);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem5
            // layoutControlItem10
            // 
            this.layoutControlItem5.Control = this.txt_fversion;
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
            this.layoutControlItem5.Text = "版本(自动)";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 18);
            this.layoutControlItem10.Control = this.txt_foneCheckor;
            this.layoutControlItem10.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(273, 31);
            this.layoutControlItem10.Text = "审核人员";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // layoutControlItem11
            // 
            this.layoutControlItem8.Control = this.txt_gg;
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 62);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(277, 32);
            this.layoutControlItem8.Text = "物料规格";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 18);
            this.layoutControlItem11.Control = this.txt_foneCheckdate;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 31);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(273, 31);
            this.layoutControlItem11.Text = "审核时间";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_foneChecked;
            this.layoutControlItem12.Location = new System.Drawing.Point(813, 62);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(273, 31);
            this.layoutControlItem12.Text = "审核标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_ftype;
            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem3.Text = "类别";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_itemNo;
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(277, 31);
            this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem7.Text = "物料编码";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 18);
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.txt_gg;
            this.layoutControlItem8.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem8.Text = "物料规格";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.btnCopy;
            this.layoutControlItem14.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31);
            this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem14.Text = "复制";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_isenabled;
            this.layoutControlItem5.Location = new System.Drawing.Point(542, 62);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem5.TextVisible = false;
            // 
            // tabMx
            // 
@@ -908,17 +800,16 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1127, 444);
            this.tabMx.Size = new System.Drawing.Size(1127, 451);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
            this.xtraTabPageCopy});
            this.tabMxPage1});
            // 
            // tabMxPage1
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1125, 412);
            this.tabMxPage1.Size = new System.Drawing.Size(1125, 419);
            this.tabMxPage1.Text = "检验项目明细";
            // 
            // gcMx1
@@ -935,7 +826,7 @@
            this.rptJYSP,
            this.repositoryItemButtonEdit1,
            this.repositoryItemComboBox1});
            this.gcMx1.Size = new System.Drawing.Size(1125, 412);
            this.gcMx1.Size = new System.Drawing.Size(1125, 419);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1215,163 +1106,6 @@
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // xtraTabPageCopy
            //
            this.xtraTabPageCopy.Controls.Add(this.gridControl2);
            this.xtraTabPageCopy.Controls.Add(this.panelControl1);
            this.xtraTabPageCopy.Name = "xtraTabPageCopy";
            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 412);
            this.xtraTabPageCopy.Text = "复制到其它物料";
            //
            // gridControl2
            //
            this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gridControl2.Location = new System.Drawing.Point(0, 43);
            this.gridControl2.MainView = this.gridView2;
            this.gridControl2.Name = "gridControl2";
            this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit3});
            this.gridControl2.Size = new System.Drawing.Size(1125, 369);
            this.gridControl2.TabIndex = 1;
            this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView2});
            //
            // gridView2
            //
            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn11,
            this.gridColumn12,
            this.gridColumn13,
            this.gridColumn14,
            this.gridColumn15,
            this.gridColumn6,
            this.gridColumn9});
            this.gridView2.GridControl = this.gridControl2;
            this.gridView2.Name = "gridView2";
            this.gridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
            this.gridView2.OptionsFind.ShowSearchNavButtons = false;
            this.gridView2.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn11
            //
            this.gridColumn11.AppearanceCell.Options.UseFont = true;
            this.gridColumn11.Caption = "使用组织";
            this.gridColumn11.FieldName = "fSubsidiary";
            this.gridColumn11.MinWidth = 150;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.OptionsColumn.ReadOnly = true;
            this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 0;
            this.gridColumn11.Width = 150;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "物料ID";
            this.gridColumn12.FieldName = "id";
            this.gridColumn12.MinWidth = 150;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.OptionsColumn.ReadOnly = true;
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 1;
            this.gridColumn12.Width = 150;
            //
            // gridColumn13
            //
            this.gridColumn13.AppearanceCell.Options.UseFont = true;
            this.gridColumn13.Caption = "物料编号";
            this.gridColumn13.FieldName = "itemNo";
            this.gridColumn13.MinWidth = 150;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.OptionsColumn.ReadOnly = true;
            this.gridColumn13.Tag = "query_a.MEMO";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 2;
            this.gridColumn13.Width = 150;
            //
            // gridColumn14
            //
            this.gridColumn14.AppearanceCell.Options.UseFont = true;
            this.gridColumn14.Caption = "物料名称";
            this.gridColumn14.FieldName = "itemName";
            this.gridColumn14.MinWidth = 150;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.OptionsColumn.ReadOnly = true;
            this.gridColumn14.Tag = "query_a.FCHECK_TOOL";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 3;
            this.gridColumn14.Width = 150;
            //
            // gridColumn15
            //
            this.gridColumn15.AppearanceCell.Options.UseFont = true;
            this.gridColumn15.Caption = "规格型号";
            this.gridColumn15.FieldName = "itemModel";
            this.gridColumn15.MinWidth = 150;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.OptionsColumn.ReadOnly = true;
            this.gridColumn15.Tag = "query_a.SAMPLE_SIZE_NO";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 4;
            this.gridColumn15.Width = 150;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "移出";
            this.gridColumn6.ColumnEdit = this.repositoryItemButtonEdit3;
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 94;
            //
            // repositoryItemButtonEdit3
            //
            this.repositoryItemButtonEdit3.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
            this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "gridColumn9";
            this.gridColumn9.FieldName = "guid";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Width = 94;
            //
            // panelControl1
            //
            this.panelControl1.Controls.Add(this.btnSave);
            this.panelControl1.Controls.Add(this.btnSelect);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panelControl1.Location = new System.Drawing.Point(0, 0);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(1125, 43);
            this.panelControl1.TabIndex = 0;
            //
            // btnSave
            //
            this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
            this.btnSave.Location = new System.Drawing.Point(139, 6);
            this.btnSave.Name = "btnSave";
            this.btnSave.Size = new System.Drawing.Size(187, 29);
            this.btnSave.TabIndex = 450;
            this.btnSave.Text = "保存复制的物料和项目";
            //
            // btnSelect
            //
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(10, 6);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(101, 29);
            this.btnSelect.TabIndex = 449;
            this.btnSelect.Text = "选择物料";
            //
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1415,26 +1149,23 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1447,12 +1178,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.xtraTabPageCopy.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -1468,15 +1193,12 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
        private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoChecked;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;
        private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckdate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckor;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
@@ -1488,24 +1210,14 @@
        private UserControl.UcLookOrg txt_fSubsidiary;
        private UserControl.UcLookItems txt_itemId;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
        private DevExpress.XtraEditors.TextEdit txt_fversion;
        private DevExpress.XtraEditors.TextEdit txt_ftwoCheckdate;
        private DevExpress.XtraEditors.TextEdit txt_ftwoCheckor;
        private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
        private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
        private DevExpress.XtraEditors.TextEdit txt_memo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraEditors.TextEdit txt_gg;
        private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraTab.XtraTabControl tabMx;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1533,28 +1245,21 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPageCopy;
        private DevExpress.XtraGrid.GridControl gridControl2;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnSave;
        private DevExpress.XtraEditors.SimpleButton btnSelect;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraEditors.SimpleButton btnCopy;
        private DevExpress.XtraEditors.TextEdit txt_ftype;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraEditors.CheckEdit txt_isenabled;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -38,7 +38,8 @@
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            txt_ftype.Text = strType;
            if (strType == "iqc")
                dfValue = 5;
            this.gvMx1.InitNewRow += (s, e) =>
@@ -64,29 +65,17 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            _setIno();
            btnSelect.Click += (s, e) =>
            btnCopy.Click += (s, e) =>
            {
                var frm = new SelectCheckDt("jyxm");
                frm.UpdateParent += (ss, ee) =>
                if ((lbGuid.Text.Trim().Length < 10))
                {
                    var lst = ee.DynamicList;
                    var json = JsonConvert.SerializeObject(lst);
                    DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
                    DataTable _oldTable = (DataTable)gridControl2.DataSource;
                    DataRow[] sourceRows = _newTable.Select();
                    for (int i = 0; i < sourceRows.Length; i++)
                    {
                        _oldTable.ImportRow(sourceRows[i]);
                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请先保存当前信息!");
                    return;
                    }
                    gridControl2.BindingContext = new BindingContext();
                    gridControl2.DataSource = _oldTable;
                    gridControl2.ForceInitialize();
                };
                JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
                frm.ShowDialog();
            };
            btnSave.Click += BtnSave_Click;
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -135,14 +124,16 @@
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        /// æ‰¹å‡†
        /// åå®¡æ ¸
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            _toolCk(2);
            _toolCk(0);
        }
        /// <summary>
@@ -220,7 +211,6 @@
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                gvList.Add(gridView2);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
        }
@@ -236,10 +226,8 @@
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            var gridViews = new List<GridView>();
            gridViews.Add(gvMx1);
            gridViews.Add(gridView2);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            xtraTabPageCopy.PageEnabled = false;
        }
        /// <summary>
@@ -360,7 +348,7 @@
                    Memo = txt_memo.Text.Trim(),
                    ItemNo = txt_itemNo.Text.Trim(),
                    Ftype = this.strType,
                    Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
                    Fversion = 0,
                    list = lst
                };
                try
@@ -377,7 +365,6 @@
                        toolBarMenu1.isSetBtn = true;
                        var gridViews = new List<GridView>();
                        gridViews.Add(gvMx1);
                        gridViews.Add(gridView2);
                        UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
                        toolBarMenu1.currentAction = "";
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
@@ -423,7 +410,6 @@
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -453,7 +439,6 @@
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            xtraTabPageCopy.PageEnabled = !isEdit;
            var _obj = new
            {
                guid = strGuid //主建
@@ -488,7 +473,6 @@
                    {
                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    UtilityHelper.SetDefaultTable(gridControl2, gridView2);
                }
                else
                {
@@ -512,6 +496,9 @@
            {
                case -1:
                    strMsg = "删除";
                    break;
                case 0:
                    strMsg = "反审核";
                    break;
                case 1:
                    strMsg = "审核";
@@ -541,23 +528,28 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_inFieldValue < 0 && _rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    {
                        getPageList(this.pageBar1.CurrentPage);
                    }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                }
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                        Form parentForm = this.FindForm();
                        UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue > 0 ? "1" : "0");
                    }
                    else
                    {
                        //注意,这里和其它页面有点不一样
                        getPageList(this.pageBar1.CurrentPage);
                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
                    }
                }
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
@@ -755,74 +747,5 @@
            }
        }
        #endregion
        /// <summary>
        /// åˆ é™¤å¤åˆ¶é¡¹
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gridView2.CloseEditor();
            gridView2.UpdateCurrentRow();
            var rowhandle = gridView2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gridView2.GetDataRow(rowhandle);
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                gridView2.DeleteRow(rowhandle);
                return;
            }
        }
        /// <summary>
        /// æäº¤ç‰©æ–™å¤åˆ¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void BtnSave_Click(object sender, EventArgs e)
        {
            int _rows = gridView2.RowCount;
            if (_rows <= 0)
            {
                MsgHelper.ShowInformation("请选择你需要复制的物料!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了" + _rows.ToString() + "条数据,确定保存吗?"))
                return;
            System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
            for (var i = 0; i < gridView2.DataRowCount; i++)
            {
                var row = gridView2.GetDataRow(i);
                if (_sbGuids.Length > 0)
                    _sbGuids.Append(",");
                Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
                _sbGuids.Append(_guid.ToString());
            }
            var _obj = new
            {
                sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                itemGuids = _sbGuids.ToString(),
                iqcType = this.strType,
                ypsl = this.dfValue
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.SetDefaultTable(gridControl2, gridView2);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,870 @@
namespace Gs.DevApp.DevFrm.QC
{
    partial class JyxmShow
    {
        /// <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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            this.wizardControl1 = new DevExpress.XtraWizard.WizardControl();
            this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptJYGJ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.sampleSizeName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptJYSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.wizardPage1 = new DevExpress.XtraWizard.WizardPage();
            this.splitLeft = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gvMain = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panBom = new DevExpress.XtraEditors.PanelControl();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.splitRight = new DevExpress.XtraEditors.SplitContainerControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.gcMainCopy = new DevExpress.XtraGrid.GridControl();
            this.gvMainCopy = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptBtnDel = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.completionWizardPage1 = new DevExpress.XtraWizard.CompletionWizardPage();
            ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).BeginInit();
            this.wizardControl1.SuspendLayout();
            this.welcomeWizardPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.wizardPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).BeginInit();
            this.splitLeft.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel2)).BeginInit();
            this.splitLeft.Panel2.SuspendLayout();
            this.splitLeft.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panBom)).BeginInit();
            this.panBom.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitRight)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel1)).BeginInit();
            this.splitRight.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel2)).BeginInit();
            this.splitRight.Panel2.SuspendLayout();
            this.splitRight.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).BeginInit();
            this.SuspendLayout();
            //
            // wizardControl1
            //
            this.wizardControl1.Controls.Add(this.welcomeWizardPage1);
            this.wizardControl1.Controls.Add(this.wizardPage1);
            this.wizardControl1.Controls.Add(this.completionWizardPage1);
            this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.wizardControl1.ImageOptions.ImageWidth = 100;
            this.wizardControl1.Margin = new System.Windows.Forms.Padding(4);
            this.wizardControl1.MinimumSize = new System.Drawing.Size(133, 138);
            this.wizardControl1.Name = "wizardControl1";
            this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] {
            this.welcomeWizardPage1,
            this.wizardPage1,
            this.completionWizardPage1});
            this.wizardControl1.Size = new System.Drawing.Size(1038, 718);
            this.wizardControl1.Text = "";
            //
            // welcomeWizardPage1
            //
            this.welcomeWizardPage1.Controls.Add(this.gcMx1);
            this.welcomeWizardPage1.IntroductionText = "该向导,将把当前物料的检验项目,复制一个或多个物料,复制过程中,若重复选择了物料,将自动过滤,只会复制一次!";
            this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4);
            this.welcomeWizardPage1.Name = "welcomeWizardPage1";
            this.welcomeWizardPage1.ProceedText = "点击 Next ç»§ç»­è¿›è¡Œ";
            this.welcomeWizardPage1.Size = new System.Drawing.Size(898, 553);
            this.welcomeWizardPage1.Text = "当前检验项目信息";
            //
            // gcMx1
            //
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.rptJYXM,
            this.rptJYGJ,
            this.rptJYBZ,
            this.rptJSSP,
            this.rptJYSP,
            this.repositoryItemButtonEdit1,
            this.repositoryItemComboBox1});
            this.gcMx1.Size = new System.Drawing.Size(898, 553);
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
            //
            // gvMx1
            //
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1guid,
            this.gvMx1pid,
            this.gvMx1fcheckItem,
            this.gvMx1forder,
            this.gridColumn5,
            this.gvMx1memo,
            this.gvMx1fcheckTool,
            this.gvMx1sampleSizeNo,
            this.sampleSizeName,
            this.gvMx1fcheckLevel,
            this.gvMx1facLevel,
            this.gvMx1fupAllow,
            this.gvMx1fstand,
            this.gvMx1fdownAllow,
            this.gridColumn19});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            //
            // gvMx1guid
            //
            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
            this.gvMx1guid.Caption = "guid";
            this.gvMx1guid.FieldName = "guid";
            this.gvMx1guid.Name = "gvMx1guid";
            this.gvMx1guid.Tag = "query_a.guid";
            this.gvMx1guid.Width = 94;
            //
            // gvMx1pid
            //
            this.gvMx1pid.AppearanceCell.Options.UseFont = true;
            this.gvMx1pid.Caption = "pid";
            this.gvMx1pid.FieldName = "pid";
            this.gvMx1pid.Name = "gvMx1pid";
            this.gvMx1pid.Tag = "query_a.pid";
            this.gvMx1pid.Width = 94;
            //
            // gvMx1fcheckItem
            //
            this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
            this.gvMx1fcheckItem.Caption = "检验项目";
            this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
            this.gvMx1fcheckItem.FieldName = "fcheckItem";
            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
            this.gvMx1fcheckItem.Tag = "edit";
            this.gvMx1fcheckItem.Visible = true;
            this.gvMx1fcheckItem.VisibleIndex = 0;
            this.gvMx1fcheckItem.Width = 150;
            //
            // rptJYXM
            //
            this.rptJYXM.AutoHeight = false;
            this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptJYXM.Name = "rptJYXM";
            //
            // gvMx1forder
            //
            this.gvMx1forder.AppearanceCell.Options.UseFont = true;
            this.gvMx1forder.Caption = "顺序";
            this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
            this.gvMx1forder.FieldName = "forder";
            this.gvMx1forder.Name = "gvMx1forder";
            this.gvMx1forder.Tag = "yz_quantity_0_edit";
            this.gvMx1forder.Visible = true;
            this.gvMx1forder.VisibleIndex = 1;
            this.gvMx1forder.Width = 50;
            //
            // repositoryItemComboBox1
            //
            this.repositoryItemComboBox1.AutoHeight = false;
            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox1.Items.AddRange(new object[] {
            "1",
            "2",
            "3",
            "4",
            "5",
            "6",
            "7",
            "8",
            "9",
            "10",
            "11",
            "12",
            "13",
            "14",
            "15"});
            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "规格要求";
            this.gridColumn5.FieldName = "fspecRequ";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "edit";
            this.gridColumn5.Width = 150;
            //
            // gvMx1memo
            //
            this.gvMx1memo.AppearanceCell.Options.UseFont = true;
            this.gvMx1memo.Caption = "检验项目描述";
            this.gvMx1memo.FieldName = "memo";
            this.gvMx1memo.Name = "gvMx1memo";
            this.gvMx1memo.Tag = "edit";
            this.gvMx1memo.Width = 150;
            //
            // gvMx1fcheckTool
            //
            this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
            this.gvMx1fcheckTool.Caption = "检验工具";
            this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
            this.gvMx1fcheckTool.FieldName = "fcheckTool";
            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
            this.gvMx1fcheckTool.Tag = "edit";
            this.gvMx1fcheckTool.Visible = true;
            this.gvMx1fcheckTool.VisibleIndex = 2;
            this.gvMx1fcheckTool.Width = 150;
            //
            // rptJYGJ
            //
            this.rptJYGJ.AutoHeight = false;
            this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptJYGJ.Name = "rptJYGJ";
            this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            //
            // gvMx1sampleSizeNo
            //
            this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1sampleSizeNo.Caption = "检验标准名称";
            this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
            this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
            this.gvMx1sampleSizeNo.Tag = "edit";
            this.gvMx1sampleSizeNo.Visible = true;
            this.gvMx1sampleSizeNo.VisibleIndex = 3;
            this.gvMx1sampleSizeNo.Width = 150;
            //
            // rptJYBZ
            //
            this.rptJYBZ.AutoHeight = false;
            this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptJYBZ.Name = "rptJYBZ";
            this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            //
            // sampleSizeName
            //
            this.sampleSizeName.Caption = "检验标准编码";
            this.sampleSizeName.FieldName = "sampleSizeNo";
            this.sampleSizeName.Name = "sampleSizeName";
            this.sampleSizeName.OptionsColumn.ReadOnly = true;
            this.sampleSizeName.Tag = "edit";
            this.sampleSizeName.Width = 150;
            //
            // gvMx1fcheckLevel
            //
            this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
            this.gvMx1fcheckLevel.Caption = "检验水平";
            this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
            this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
            this.gvMx1fcheckLevel.Tag = "edit";
            this.gvMx1fcheckLevel.Visible = true;
            this.gvMx1fcheckLevel.VisibleIndex = 4;
            this.gvMx1fcheckLevel.Width = 200;
            //
            // rptJYSP
            //
            this.rptJYSP.AutoHeight = false;
            this.rptJYSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptJYSP.Name = "rptJYSP";
            this.rptJYSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            //
            // gvMx1facLevel
            //
            this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
            this.gvMx1facLevel.Caption = "接收水平";
            this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
            this.gvMx1facLevel.FieldName = "facLevel";
            this.gvMx1facLevel.Name = "gvMx1facLevel";
            this.gvMx1facLevel.Tag = "edit";
            this.gvMx1facLevel.Visible = true;
            this.gvMx1facLevel.VisibleIndex = 5;
            this.gvMx1facLevel.Width = 150;
            //
            // rptJSSP
            //
            this.rptJSSP.AutoHeight = false;
            this.rptJSSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptJSSP.Name = "rptJSSP";
            this.rptJSSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            //
            // gvMx1fupAllow
            //
            this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
            this.gvMx1fupAllow.Caption = "上限";
            this.gvMx1fupAllow.FieldName = "fupAllow";
            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
            this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
            this.gvMx1fupAllow.Visible = true;
            this.gvMx1fupAllow.VisibleIndex = 6;
            this.gvMx1fupAllow.Width = 60;
            //
            // gvMx1fstand
            //
            this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
            this.gvMx1fstand.Caption = "标准值";
            this.gvMx1fstand.FieldName = "fstand";
            this.gvMx1fstand.Name = "gvMx1fstand";
            this.gvMx1fstand.Tag = "yz_quantity_0_edit";
            this.gvMx1fstand.Visible = true;
            this.gvMx1fstand.VisibleIndex = 7;
            this.gvMx1fstand.Width = 60;
            //
            // gvMx1fdownAllow
            //
            this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
            this.gvMx1fdownAllow.Caption = "下限";
            this.gvMx1fdownAllow.FieldName = "fdownAllow";
            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
            this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
            this.gvMx1fdownAllow.Visible = true;
            this.gvMx1fdownAllow.VisibleIndex = 8;
            this.gvMx1fdownAllow.Width = 60;
            //
            // gridColumn19
            //
            this.gridColumn19.Caption = "样品基数";
            this.gridColumn19.FieldName = "ypsl";
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Tag = "edit";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 9;
            this.gridColumn19.Width = 94;
            //
            // repositoryItemButtonEdit1
            //
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // wizardPage1
            //
            this.wizardPage1.Controls.Add(this.splitLeft);
            this.wizardPage1.DescriptionText = "你可以选择一个或多个";
            this.wizardPage1.Margin = new System.Windows.Forms.Padding(4);
            this.wizardPage1.Name = "wizardPage1";
            this.wizardPage1.Size = new System.Drawing.Size(998, 540);
            this.wizardPage1.Text = "选择物料";
            //
            // splitLeft
            //
            this.splitLeft.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitLeft.Location = new System.Drawing.Point(0, 0);
            this.splitLeft.Name = "splitLeft";
            //
            // splitLeft.Panel1
            //
            this.splitLeft.Panel1.Controls.Add(this.gcMain);
            this.splitLeft.Panel1.Controls.Add(this.panBom);
            this.splitLeft.Panel1.Text = "Panel1";
            //
            // splitLeft.Panel2
            //
            this.splitLeft.Panel2.Controls.Add(this.splitRight);
            this.splitLeft.Panel2.Text = "Panel2";
            this.splitLeft.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitLeft.Size = new System.Drawing.Size(998, 540);
            this.splitLeft.SplitterPosition = 519;
            this.splitLeft.TabIndex = 1;
            //
            // gcMain
            //
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gvMain;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(519, 496);
            this.gcMain.TabIndex = 7;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMain});
            //
            // gvMain
            //
            this.gvMain.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMain.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMain.Appearance.Row.Options.UseFont = true;
            this.gvMain.ColumnPanelRowHeight = 50;
            this.gvMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.colChkInt,
            this.gv_guid,
            this.gridColumn1,
            this.gv2,
            this.gv_salesOrderId,
            this.gv_orderLineId,
            this.gv_itemId,
            this.gridColumn2});
            this.gvMain.GridControl = this.gcMain;
            this.gvMain.IndicatorWidth = 50;
            this.gvMain.Name = "gvMain";
            this.gvMain.OptionsFind.ShowSearchNavButtons = false;
            this.gvMain.OptionsView.ShowAutoFilterRow = true;
            this.gvMain.OptionsView.ShowGroupPanel = false;
            //
            // colChkInt
            //
            this.colChkInt.Caption = ".";
            this.colChkInt.FieldName = "chkInt";
            this.colChkInt.MinWidth = 25;
            this.colChkInt.Name = "colChkInt";
            this.colChkInt.Visible = true;
            this.colChkInt.VisibleIndex = 0;
            this.colChkInt.Width = 94;
            //
            // gv_guid
            //
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键不能删除";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "a.guid";
            this.gv_guid.Width = 94;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "使用组织";
            this.gridColumn1.FieldName = "fSubsidiary";
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "org.FNumber";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.Width = 50;
            //
            // gv2
            //
            this.gv2.AppearanceCell.Options.UseFont = true;
            this.gv2.Caption = "物料ID";
            this.gv2.FieldName = "id";
            this.gv2.Name = "gv2";
            this.gv2.OptionsColumn.AllowEdit = false;
            this.gv2.Tag = "a.id";
            this.gv2.Visible = true;
            this.gv2.VisibleIndex = 1;
            this.gv2.Width = 50;
            //
            // gv_salesOrderId
            //
            this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
            this.gv_salesOrderId.Caption = "物料编码";
            this.gv_salesOrderId.FieldName = "itemNo";
            this.gv_salesOrderId.Name = "gv_salesOrderId";
            this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
            this.gv_salesOrderId.Tag = "a.item_no";
            this.gv_salesOrderId.Visible = true;
            this.gv_salesOrderId.VisibleIndex = 2;
            this.gv_salesOrderId.Width = 50;
            //
            // gv_orderLineId
            //
            this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
            this.gv_orderLineId.Caption = "物料名称";
            this.gv_orderLineId.FieldName = "itemName";
            this.gv_orderLineId.Name = "gv_orderLineId";
            this.gv_orderLineId.OptionsColumn.AllowEdit = false;
            this.gv_orderLineId.Tag = "a.item_name";
            this.gv_orderLineId.Visible = true;
            this.gv_orderLineId.VisibleIndex = 3;
            this.gv_orderLineId.Width = 50;
            //
            // gv_itemId
            //
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料规格";
            this.gv_itemId.FieldName = "itemModel";
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "a.item_model";
            this.gv_itemId.Width = 50;
            //
            // gridColumn2
            //
            this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn2.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn2.Caption = "配置次数";
            this.gridColumn2.FieldName = "jyxm";
            this.gridColumn2.MaxWidth = 50;
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.ReadOnly = true;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 4;
            this.gridColumn2.Width = 50;
            //
            // panBom
            //
            this.panBom.Controls.Add(this.pageBar1);
            this.panBom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panBom.Location = new System.Drawing.Point(0, 496);
            this.panBom.Name = "panBom";
            this.panBom.Size = new System.Drawing.Size(519, 44);
            this.panBom.TabIndex = 6;
            //
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.pageBar1.Location = new System.Drawing.Point(2, 2);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(515, 40);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            //
            // splitRight
            //
            this.splitRight.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitRight.Location = new System.Drawing.Point(0, 0);
            this.splitRight.Name = "splitRight";
            //
            // splitRight.Panel1
            //
            this.splitRight.Panel1.Controls.Add(this.btnIn);
            this.splitRight.Panel1.Text = "Panel1";
            //
            // splitRight.Panel2
            //
            this.splitRight.Panel2.Controls.Add(this.gcMainCopy);
            this.splitRight.Panel2.Text = "Panel2";
            this.splitRight.Size = new System.Drawing.Size(467, 540);
            this.splitRight.SplitterPosition = 45;
            this.splitRight.TabIndex = 3;
            //
            // btnIn
            //
            this.btnIn.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.btnIn.Appearance.Options.UseForeColor = true;
            this.btnIn.Location = new System.Drawing.Point(4, 199);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(39, 29);
            this.btnIn.TabIndex = 0;
            this.btnIn.Text = ">>";
            //
            // gcMainCopy
            //
            this.gcMainCopy.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMainCopy.Location = new System.Drawing.Point(0, 0);
            this.gcMainCopy.MainView = this.gvMainCopy;
            this.gcMainCopy.Name = "gcMainCopy";
            this.gcMainCopy.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.rptBtnDel});
            this.gcMainCopy.Size = new System.Drawing.Size(410, 540);
            this.gcMainCopy.TabIndex = 2;
            this.gcMainCopy.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMainCopy});
            //
            // gvMainCopy
            //
            this.gvMainCopy.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn11,
            this.gridColumn12,
            this.gridColumn13,
            this.gridColumn14,
            this.gridColumn15,
            this.gridColumn6,
            this.gridColumn9});
            this.gvMainCopy.GridControl = this.gcMainCopy;
            this.gvMainCopy.Name = "gvMainCopy";
            this.gvMainCopy.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
            this.gvMainCopy.OptionsFind.ShowSearchNavButtons = false;
            this.gvMainCopy.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn11
            //
            this.gridColumn11.AppearanceCell.Options.UseFont = true;
            this.gridColumn11.Caption = "使用组织";
            this.gridColumn11.FieldName = "fSubsidiary";
            this.gridColumn11.MinWidth = 10;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.OptionsColumn.ReadOnly = true;
            this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 0;
            this.gridColumn11.Width = 150;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "物料ID";
            this.gridColumn12.FieldName = "id";
            this.gridColumn12.MinWidth = 10;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.OptionsColumn.ReadOnly = true;
            this.gridColumn12.Tag = "query_a.item_id";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 1;
            this.gridColumn12.Width = 150;
            //
            // gridColumn13
            //
            this.gridColumn13.AppearanceCell.Options.UseFont = true;
            this.gridColumn13.Caption = "物料编号";
            this.gridColumn13.FieldName = "itemNo";
            this.gridColumn13.MinWidth = 10;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.OptionsColumn.ReadOnly = true;
            this.gridColumn13.Tag = "query_a.item_no";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 2;
            this.gridColumn13.Width = 150;
            //
            // gridColumn14
            //
            this.gridColumn14.AppearanceCell.Options.UseFont = true;
            this.gridColumn14.Caption = "物料名称";
            this.gridColumn14.FieldName = "itemName";
            this.gridColumn14.MinWidth = 10;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.OptionsColumn.ReadOnly = true;
            this.gridColumn14.Tag = "query_a.item_name";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 3;
            this.gridColumn14.Width = 150;
            //
            // gridColumn15
            //
            this.gridColumn15.AppearanceCell.Options.UseFont = true;
            this.gridColumn15.Caption = "规格型号";
            this.gridColumn15.FieldName = "itemModel";
            this.gridColumn15.MinWidth = 10;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.OptionsColumn.ReadOnly = true;
            this.gridColumn15.Tag = "query_a.item_model";
            this.gridColumn15.Width = 150;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "移出";
            this.gridColumn6.ColumnEdit = this.rptBtnDel;
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 4;
            this.gridColumn6.Width = 94;
            //
            // rptBtnDel
            //
            this.rptBtnDel.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.rptBtnDel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.rptBtnDel.Name = "rptBtnDel";
            this.rptBtnDel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptBtnDel.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnDel_ButtonClick);
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "gridColumn9";
            this.gridColumn9.FieldName = "guid";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Width = 94;
            //
            // completionWizardPage1
            //
            this.completionWizardPage1.FinishText = "最后一步,点击“Finish”保存复制信息";
            this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4);
            this.completionWizardPage1.Name = "completionWizardPage1";
            this.completionWizardPage1.ProceedText = "点击“Finish”保存信息";
            this.completionWizardPage1.Size = new System.Drawing.Size(898, 553);
            this.completionWizardPage1.Text = "保存信息";
            //
            // JyxmShow
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1038, 718);
            this.Controls.Add(this.wizardControl1);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
            this.Margin = new System.Windows.Forms.Padding(4);
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "JyxmShow";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Text = "检验项目复制";
            ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit();
            this.wizardControl1.ResumeLayout(false);
            this.welcomeWizardPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.wizardPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).EndInit();
            this.splitLeft.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel2)).EndInit();
            this.splitLeft.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).EndInit();
            this.splitLeft.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.panBom)).EndInit();
            this.panBom.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel1)).EndInit();
            this.splitRight.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel2)).EndInit();
            this.splitRight.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitRight)).EndInit();
            this.splitRight.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraWizard.WizardControl wizardControl1;
        private DevExpress.XtraWizard.WelcomeWizardPage welcomeWizardPage1;
        private DevExpress.XtraWizard.WizardPage wizardPage1;
        private DevExpress.XtraWizard.CompletionWizardPage completionWizardPage1;
        private DevExpress.XtraEditors.SplitContainerControl splitLeft;
        private DevExpress.XtraGrid.GridControl gcMainCopy;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMainCopy;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBtnDel;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraEditors.SplitContainerControl splitRight;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private DevExpress.XtraEditors.PanelControl panBom;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMain;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv2;
        private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
        private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,262 @@
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
{
    public partial class JyxmShow : DevExpress.XtraEditors.XtraForm
    {
        private List<FilterEntity> _filterList = new List<FilterEntity>();
        private readonly string _webServiceName = "MesQmCheckitemManager/";
        private string strType = "";//iqc,ipqc,fqc
        private string sourceGuid = "";//源guid
        /// <summary>
        ///
        /// </summary>
        /// <param name="_sourceGuid"></param>
        /// <param name="_strType"></param>
        public JyxmShow(string _sourceGuid, string _strType)
        {
            InitializeComponent();
            strType = _strType;
            sourceGuid = _sourceGuid;
            this.gvMain.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
            this.gvMain.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gvMain); };
            this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
            this.colChkInt.OptionsFilter.AllowAutoFilter = false;
            this.colChkInt.OptionsFilter.AllowFilter = false;
            this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
            this.pageBar1.setBar(false);
            getPageList(1);
            getModel(_sourceGuid);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMainCopy);
            UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
            btnIn.Click += (s, e) =>
            {
                gvMain.PostEditor();
                gvMain.UpdateCurrentRow();
                var list = new List<string>();
                DataTable _oldTable = (DataTable)gcMainCopy.DataSource;
                DataTable dt = this.gcMain.DataSource as DataTable;
                {
                    foreach (DataRow dr in dt.Rows)
                    {
                        string checkBox = dr["chkInt"].ToString();
                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
                        {
                            _oldTable.ImportRow(dr);
                        }
                    }
                }
                if (_oldTable.Rows.Count <= 0)
                {
                    MsgHelper.ShowInformation("请选择你需要复制的物料!");
                    return;
                }
                gcMainCopy.BindingContext = new BindingContext();
                gcMainCopy.DataSource = _oldTable;
                gcMainCopy.ForceInitialize();
                gvMainCopy.BestFitColumns();
            };
            this.wizardControl1.FinishClick += (s, e) =>
            {
                int _rows = gvMainCopy.RowCount;
                if (_rows <= 0)
                {
                    MsgHelper.ShowInformation("请选择你需要复制的物料!");
                    e.Cancel = true;
                    return;
                }
                if (!MsgHelper.AskQuestion("你选择了" + _rows.ToString() + "条数据,确定保存吗?"))
                {
                    e.Cancel = true;
                    return;
                }
                System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
                for (var i = 0; i < gvMainCopy.DataRowCount; i++)
                {
                    var row = gvMainCopy.GetDataRow(i);
                    if (_sbGuids.Length > 0)
                        _sbGuids.Append(",");
                    Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
                    _sbGuids.Append(_guid.ToString());
                }
                var _obj = new
                {
                    sourceGuid = UtilityHelper.ToGuid(_sourceGuid),
                    itemGuids = _sbGuids.ToString(),
                    iqcType = this.strType,
                };
                try
                {
                    var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
                    }
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            };
            this.wizardControl1.NextClick += (s, e) =>
            {
                string pageText = e.Page.Text;
                if (pageText == "选择物料")
                {
                    int _rows = gvMainCopy.RowCount;
                    if (_rows <= 0)
                    {
                        MsgHelper.ShowInformation("请选择你需要复制的物料!");
                        e.Handled = true;
                        return;
                    }
                }
            };
        }
        #region æºç‰©æ–™æ•°æ®ç»‘定
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gvMain.Columns, gvMain);
            Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        ///     åˆ†é¡µäº‹ä»¶
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gvMain.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gvMain.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMain);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gvMain);
                    gvMain.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        #endregion
        private void getModel(string strGuid)
        {
            var _obj = new
            {
                guid = strGuid //主建
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                         _webServiceName + "GetModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn =
                    UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    var dy = _rtn.rtnData;
                    var gvList = new List<GridView>();
                    gvList.Add(gvMx1);
                    var _job = JObject.Parse(strJson);
                    var array = new JArray();
                    foreach (var a in _job["rtnData"]["list"]) array.Add(a);
                    var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    if (dt.Rows.Count > 0)
                    {
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
                }
                else
                {
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// åˆ é™¤å¤åˆ¶é¡¹
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void rptBtnDel_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMainCopy.CloseEditor();
            gvMainCopy.UpdateCurrentRow();
            var rowhandle = gvMainCopy.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMainCopy.GetDataRow(rowhandle);
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                gvMainCopy.DeleteRow(rowhandle);
                return;
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.resx
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.Designer.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -428,6 +428,12 @@
    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs">
      <DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\JyxmShow.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\JyxmShow.Designer.cs">
      <DependentUpon>JyxmShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\MesQcExceptionalShow.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -925,12 +931,6 @@
    <Compile Include="UserControl\SelectCgMx.Designer.cs">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\SelectCheckDt.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\SelectCheckDt.Designer.cs">
      <DependentUpon>SelectCheckDt.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCw.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1304,6 +1304,9 @@
    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.resx">
      <DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\JyxmShow.resx">
      <DependentUpon>JyxmShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\MesQcExceptionalShow.resx">
      <DependentUpon>MesQcExceptionalShow.cs</DependentUpon>
    </EmbeddedResource>
@@ -1532,9 +1535,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCgMx.resx">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\SelectCheckDt.resx">
      <DependentUpon>SelectCheckDt.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCw.resx">
      <DependentUpon>SelectCw.cs</DependentUpon>
@@ -1900,6 +1900,7 @@
    <None Include="Resources\login_bgOk.jpg" />
    <None Include="Resources\sendpdf_32x32.png" />
    <None Include="Resources\exporttopdf_16x16.png" />
    <None Include="Resources\chartswitchrowcolumn_16x16.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -393,6 +393,16 @@
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„æœ¬åœ°åŒ–资源。
        /// </summary>
        internal static System.Drawing.Bitmap chartswitchrowcolumn_16x16 {
            get {
                object obj = ResourceManager.GetObject("chartswitchrowcolumn_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„æœ¬åœ°åŒ–资源。
        /// </summary>
        internal static System.Drawing.Bitmap checkbox_32x32 {
            get {
                object obj = ResourceManager.GetObject("checkbox_32x32", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -127,6 +127,11 @@
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -144,17 +149,24 @@
  <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -223,6 +235,11 @@
  <data name="error123" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\error123.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -240,17 +257,16 @@
  <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="login_bgOk" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\login_bgOk.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -261,8 +277,8 @@
  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -274,6 +290,11 @@
  </data>
  <data name="radiobuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -290,27 +311,20 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -342,22 +356,19 @@
  <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
@@ -370,14 +381,21 @@
  <data name="calculatenow" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\calculatenow.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -542,11 +560,24 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -574,14 +605,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -623,11 +651,6 @@
  <data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -639,9 +662,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -650,8 +670,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\last_16x16.png;System.Drawing.Bitmap,
@@ -685,9 +707,6 @@
  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -705,9 +724,6 @@
  <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -716,6 +732,11 @@
  </data>
  <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -791,6 +812,9 @@
  <data name="snapmodifytablecellstyle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\snapmodifytablecellstyle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -831,18 +855,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -859,15 +876,16 @@
  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap,
@@ -879,16 +897,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -903,34 +916,22 @@
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -965,22 +966,22 @@
  <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -998,15 +999,16 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1017,31 +1019,32 @@
  <data name="checkbox2_32x324" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="exporttopdf_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\exporttopdf_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="exporttopdf_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\exporttopdf_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,21 +1,22 @@
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevApp/Gs.DevApp/Resources/chartswitchrowcolumn_16x16.png
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -613,6 +613,9 @@
                        if (colType is SimpleButton)
                        {
                            var txt = colType as SimpleButton;
                            if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
                                txt.Enabled = true;
                            else
                            txt.Enabled = !isEdt;
                            continue;
                        }
@@ -912,6 +915,9 @@
                if (ctrl is SimpleButton)
                {
                    var txt = ctrl as SimpleButton;
                    if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
                        txt.Enabled = true;
                    else
                    txt.Enabled = !isEdt;
                    continue;
                }
@@ -1136,6 +1142,9 @@
                if (ctrl is SimpleButton)
                {
                    var txt = ctrl as SimpleButton;
                    if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
                        txt.Enabled = true;
                    else
                    txt.Enabled = !isEdt;
                    continue;
                }
@@ -1659,7 +1668,8 @@
                {
                    _val = ddd[1].Trim();
                }
                else {
                else
                {
                    ddd = _filterString.Split('=');
                    _val = ddd[1].Trim();
                }