lu
2024-12-07 c733a40f757501b3b1c95fec58e009e9703786ec
细节
已添加1个文件
已修改9个文件
703 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs 250 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs 257 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 107 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/exportfile_16x161.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -72,10 +72,10 @@
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(264, 457);
            this.panel1.Location = new System.Drawing.Point(230, 457);
            this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(270, 276);
            this.panel1.Size = new System.Drawing.Size(328, 276);
            this.panel1.TabIndex = 243;
            // 
            // comOrg
@@ -83,7 +83,7 @@
            this.comOrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.comOrg.Font = new System.Drawing.Font("Tahoma", 10F);
            this.comOrg.FormattingEnabled = true;
            this.comOrg.Location = new System.Drawing.Point(100, 97);
            this.comOrg.Location = new System.Drawing.Point(138, 97);
            this.comOrg.Name = "comOrg";
            this.comOrg.Size = new System.Drawing.Size(154, 29);
            this.comOrg.TabIndex = 245;
@@ -91,7 +91,7 @@
            // txtUser
            // 
            this.txtUser.EditValue = "";
            this.txtUser.Location = new System.Drawing.Point(102, 9);
            this.txtUser.Location = new System.Drawing.Point(138, 9);
            this.txtUser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txtUser.Name = "txtUser";
            this.txtUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -102,7 +102,7 @@
            // 
            // ckRemember
            // 
            this.ckRemember.Location = new System.Drawing.Point(102, 139);
            this.ckRemember.Location = new System.Drawing.Point(138, 139);
            this.ckRemember.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.ckRemember.Name = "ckRemember";
            this.ckRemember.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -117,7 +117,7 @@
            // txtPwd
            // 
            this.txtPwd.EditValue = "";
            this.txtPwd.Location = new System.Drawing.Point(102, 53);
            this.txtPwd.Location = new System.Drawing.Point(138, 53);
            this.txtPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txtPwd.Name = "txtPwd";
            this.txtPwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -134,7 +134,7 @@
            this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
            this.btnCancel.Location = new System.Drawing.Point(153, 193);
            this.btnCancel.Location = new System.Drawing.Point(189, 193);
            this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Size = new System.Drawing.Size(103, 37);
@@ -150,7 +150,7 @@
            this.labelControl3.Appearance.Options.UseTextOptions = true;
            this.labelControl3.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            this.labelControl3.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
            this.labelControl3.Location = new System.Drawing.Point(6, 102);
            this.labelControl3.Location = new System.Drawing.Point(42, 102);
            this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(93, 18);
@@ -164,7 +164,7 @@
            this.btnLogin.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnLogin.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnLogin.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnLogin.ImageOptions.Image")));
            this.btnLogin.Location = new System.Drawing.Point(36, 193);
            this.btnLogin.Location = new System.Drawing.Point(72, 193);
            this.btnLogin.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnLogin.Name = "btnLogin";
            this.btnLogin.Size = new System.Drawing.Size(102, 37);
@@ -180,7 +180,7 @@
            this.labelControl2.Appearance.Options.UseTextOptions = true;
            this.labelControl2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            this.labelControl2.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
            this.labelControl2.Location = new System.Drawing.Point(6, 59);
            this.labelControl2.Location = new System.Drawing.Point(42, 59);
            this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(93, 18);
@@ -196,7 +196,7 @@
            this.labelControl1.Appearance.Options.UseTextOptions = true;
            this.labelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            this.labelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
            this.labelControl1.Location = new System.Drawing.Point(6, 15);
            this.labelControl1.Location = new System.Drawing.Point(42, 15);
            this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(93, 18);
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -29,16 +29,16 @@
        /// </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();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -65,7 +65,6 @@
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.lb_tname = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
            this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_fversion = new DevExpress.XtraEditors.LabelControl();
            this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
@@ -104,7 +103,7 @@
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            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();
@@ -114,19 +113,16 @@
            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.panel1 = new System.Windows.Forms.Panel();
            this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
            this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems();
            this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
            this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
            this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
            this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
            this.labelCreateDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.labelUserName = new DevExpress.XtraEditors.LabelControl();
            this.txt_userName = new DevExpress.XtraEditors.TextEdit();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
@@ -153,7 +149,7 @@
            this.xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.xtraTabPage3.SuspendLayout();
            this.xtraTabPageCopy.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
@@ -161,11 +157,8 @@
            this.panelControl1.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -210,7 +203,7 @@
            this.gvMx1fstand.FieldName = "fstand";
            this.gvMx1fstand.MinWidth = 60;
            this.gvMx1fstand.Name = "gvMx1fstand";
            this.gvMx1fstand.Tag = "query_a.FSTAND";
            this.gvMx1fstand.Tag = "yz_quantity_0";
            this.gvMx1fstand.Visible = true;
            this.gvMx1fstand.VisibleIndex = 10;
            this.gvMx1fstand.Width = 150;
@@ -245,7 +238,7 @@
            this.gvMx1fdownAllow.FieldName = "fdownAllow";
            this.gvMx1fdownAllow.MinWidth = 60;
            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
            this.gvMx1fdownAllow.Tag = "query_a.FDOWN_ALLOW";
            this.gvMx1fdownAllow.Tag = "yz_quantity_0";
            this.gvMx1fdownAllow.Visible = true;
            this.gvMx1fdownAllow.VisibleIndex = 11;
            this.gvMx1fdownAllow.Width = 60;
@@ -325,7 +318,7 @@
            this.gvMx1fupAllow.FieldName = "fupAllow";
            this.gvMx1fupAllow.MinWidth = 60;
            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
            this.gvMx1fupAllow.Tag = "query_a.FUP_ALLOW";
            this.gvMx1fupAllow.Tag = "yz_quantity_0";
            this.gvMx1fupAllow.Visible = true;
            this.gvMx1fupAllow.VisibleIndex = 9;
            this.gvMx1fupAllow.Width = 60;
@@ -451,10 +444,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -463,7 +456,7 @@
            // 
            this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tname.Appearance.Options.UseFont = true;
            this.lb_tname.Location = new System.Drawing.Point(9, 59);
            this.lb_tname.Location = new System.Drawing.Point(9, 54);
            this.lb_tname.Name = "lb_tname";
            this.lb_tname.Size = new System.Drawing.Size(68, 21);
            this.lb_tname.TabIndex = 370;
@@ -472,22 +465,12 @@
            // txt_itemNo
            // 
            this.txt_itemNo.Enabled = false;
            this.txt_itemNo.Location = new System.Drawing.Point(85, 55);
            this.txt_itemNo.Location = new System.Drawing.Point(85, 50);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(266, 28);
            this.txt_itemNo.Size = new System.Drawing.Size(262, 28);
            this.txt_itemNo.TabIndex = 370;
            //
            // lb_isenabled
            //
            this.lb_isenabled.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_isenabled.Appearance.Options.UseFont = true;
            this.lb_isenabled.Location = new System.Drawing.Point(989, 96);
            this.lb_isenabled.Name = "lb_isenabled";
            this.lb_isenabled.Size = new System.Drawing.Size(73, 21);
            this.lb_isenabled.TabIndex = 306;
            this.lb_isenabled.Text = "是否可用 ";
            // 
            // gv_isenabled
            // 
@@ -507,7 +490,7 @@
            // 
            this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fversion.Appearance.Options.UseFont = true;
            this.lb_fversion.Location = new System.Drawing.Point(389, 139);
            this.lb_fversion.Location = new System.Drawing.Point(361, 54);
            this.lb_fversion.Name = "lb_fversion";
            this.lb_fversion.Size = new System.Drawing.Size(39, 21);
            this.lb_fversion.TabIndex = 298;
@@ -515,7 +498,8 @@
            // 
            // txt_fversion
            // 
            this.txt_fversion.Location = new System.Drawing.Point(433, 132);
            this.txt_fversion.Enabled = false;
            this.txt_fversion.Location = new System.Drawing.Point(405, 50);
            this.txt_fversion.Name = "txt_fversion";
            this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fversion.Properties.Appearance.Options.UseFont = true;
@@ -533,14 +517,14 @@
            this.gv_fversion.OptionsColumn.AllowEdit = false;
            this.gv_fversion.Tag = "query_a.FVERSION";
            this.gv_fversion.Visible = true;
            this.gv_fversion.VisibleIndex = 8;
            this.gv_fversion.VisibleIndex = 4;
            this.gv_fversion.Width = 94;
            // 
            // lb_ftwoCheckdate
            // 
            this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
            this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 59);
            this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 54);
            this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
            this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
            this.lb_ftwoCheckdate.TabIndex = 285;
@@ -549,11 +533,11 @@
            // txt_ftwoCheckdate
            // 
            this.txt_ftwoCheckdate.Enabled = false;
            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 55);
            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 50);
            this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
            this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
            this.txt_ftwoCheckdate.Size = new System.Drawing.Size(158, 28);
            this.txt_ftwoCheckdate.Size = new System.Drawing.Size(172, 28);
            this.txt_ftwoCheckdate.TabIndex = 285;
            // 
            // lb_ftwoCheckor
@@ -573,7 +557,7 @@
            this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
            this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
            this.txt_ftwoCheckor.Size = new System.Drawing.Size(158, 28);
            this.txt_ftwoCheckor.Size = new System.Drawing.Size(172, 28);
            this.txt_ftwoCheckor.TabIndex = 280;
            // 
            // gv_ftwoCheckor
@@ -582,7 +566,7 @@
            this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
            this.gv_ftwoCheckor.Caption = "批准人";
            this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
            this.gv_ftwoCheckor.MinWidth = 50;
            this.gv_ftwoCheckor.MinWidth = 80;
            this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
            this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
            this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
@@ -594,11 +578,11 @@
            // 
            this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_ftwoChecked.Appearance.Options.UseFont = true;
            this.lb_ftwoChecked.Location = new System.Drawing.Point(612, 96);
            this.lb_ftwoChecked.Location = new System.Drawing.Point(361, 86);
            this.lb_ftwoChecked.Name = "lb_ftwoChecked";
            this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21);
            this.lb_ftwoChecked.Size = new System.Drawing.Size(68, 21);
            this.lb_ftwoChecked.TabIndex = 273;
            this.lb_ftwoChecked.Text = "批准标记 ";
            this.lb_ftwoChecked.Text = "批准标记";
            // 
            // gv_ftwoChecked
            // 
@@ -618,7 +602,7 @@
            // 
            this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_foneCheckdate.Appearance.Options.UseFont = true;
            this.lb_foneCheckdate.Location = new System.Drawing.Point(849, 59);
            this.lb_foneCheckdate.Location = new System.Drawing.Point(612, 127);
            this.lb_foneCheckdate.Name = "lb_foneCheckdate";
            this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
            this.lb_foneCheckdate.TabIndex = 267;
@@ -627,7 +611,7 @@
            // txt_foneCheckdate
            // 
            this.txt_foneCheckdate.Enabled = false;
            this.txt_foneCheckdate.Location = new System.Drawing.Point(928, 55);
            this.txt_foneCheckdate.Location = new System.Drawing.Point(685, 123);
            this.txt_foneCheckdate.Name = "txt_foneCheckdate";
            this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
@@ -652,7 +636,7 @@
            // 
            this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_foneCheckor.Appearance.Options.UseFont = true;
            this.lb_foneCheckor.Location = new System.Drawing.Point(866, 20);
            this.lb_foneCheckor.Location = new System.Drawing.Point(629, 86);
            this.lb_foneCheckor.Name = "lb_foneCheckor";
            this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
            this.lb_foneCheckor.TabIndex = 262;
@@ -661,7 +645,7 @@
            // txt_foneCheckor
            // 
            this.txt_foneCheckor.Enabled = false;
            this.txt_foneCheckor.Location = new System.Drawing.Point(928, 16);
            this.txt_foneCheckor.Location = new System.Drawing.Point(685, 86);
            this.txt_foneCheckor.Name = "txt_foneCheckor";
            this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
@@ -686,11 +670,11 @@
            // 
            this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_foneChecked.Appearance.Options.UseFont = true;
            this.lb_foneChecked.Location = new System.Drawing.Point(849, 96);
            this.lb_foneChecked.Location = new System.Drawing.Point(361, 127);
            this.lb_foneChecked.Name = "lb_foneChecked";
            this.lb_foneChecked.Size = new System.Drawing.Size(73, 21);
            this.lb_foneChecked.Size = new System.Drawing.Size(68, 21);
            this.lb_foneChecked.TabIndex = 258;
            this.lb_foneChecked.Text = "审批标记 ";
            this.lb_foneChecked.Text = "审批标记";
            // 
            // gv_foneChecked
            // 
@@ -727,14 +711,14 @@
            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 = 6;
            this.gv_itemNo.Width = 150;
            // 
            // lb_memo
            // 
            this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_memo.Appearance.Options.UseFont = true;
            this.lb_memo.Location = new System.Drawing.Point(389, 96);
            this.lb_memo.Location = new System.Drawing.Point(361, 20);
            this.lb_memo.Name = "lb_memo";
            this.lb_memo.Size = new System.Drawing.Size(39, 21);
            this.lb_memo.TabIndex = 219;
@@ -742,7 +726,7 @@
            // 
            // txt_memo
            // 
            this.txt_memo.Location = new System.Drawing.Point(433, 96);
            this.txt_memo.Location = new System.Drawing.Point(405, 16);
            this.txt_memo.Name = "txt_memo";
            this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_memo.Properties.Appearance.Options.UseFont = true;
@@ -765,7 +749,7 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = "MES_QM_CHECKITEM,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mes_CHECKITEM";
            this.toolBarMenu1.chkParameter = " 0,0,0,0,000chk_mes_CHECKITEM";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -801,11 +785,11 @@
            this.gv_isenabled,
            this.gv_foneChecked,
            this.gv_ftwoChecked,
            this.gv_fversion,
            this.gridColumn7,
            this.gv_itemNo,
            this.gridColumn3,
            this.gridColumn2,
            this.gv_fversion,
            this.gv_foneCheckor,
            this.gv_foneCheckdate,
            this.gv_ftwoCheckor,
@@ -840,7 +824,7 @@
            this.gridColumn7.OptionsColumn.AllowEdit = false;
            this.gridColumn7.Tag = "query_a.ITEM_ID";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 4;
            this.gridColumn7.VisibleIndex = 5;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn3
@@ -852,7 +836,7 @@
            this.gridColumn3.OptionsColumn.AllowEdit = false;
            this.gridColumn3.Tag = "query_b.item_name";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.Width = 250;
            // 
            // gridColumn2
@@ -864,14 +848,14 @@
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Tag = "query_b.item_model";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.VisibleIndex = 8;
            this.gridColumn2.Width = 100;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "制作人";
            this.gridColumn1.FieldName = "createBy";
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Tag = "query_a.CREATE_BY";
@@ -942,15 +926,15 @@
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
            this.xtraTabPage3});
            this.xtraTabPageCopy});
            // 
            // xtraTabPage3
            // xtraTabPageCopy
            // 
            this.xtraTabPage3.Controls.Add(this.gridControl2);
            this.xtraTabPage3.Controls.Add(this.panelControl1);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1125, 371);
            this.xtraTabPage3.Text = "复制到其它物料";
            this.xtraTabPageCopy.Controls.Add(this.gridControl2);
            this.xtraTabPageCopy.Controls.Add(this.panelControl1);
            this.xtraTabPageCopy.Name = "xtraTabPageCopy";
            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 371);
            this.xtraTabPageCopy.Text = "复制到其它物料";
            // 
            // gridControl2
            // 
@@ -973,12 +957,12 @@
            this.gridColumn13,
            this.gridColumn14,
            this.gridColumn15,
            this.gridColumn6});
            this.gridColumn6,
            this.gridColumn9});
            this.gridView2.GridControl = this.gridControl2;
            this.gridView2.Name = "gridView2";
            this.gridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
            this.gridView2.OptionsFind.ShowSearchNavButtons = false;
            this.gridView2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gridView2.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn11
@@ -989,6 +973,7 @@
            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;
@@ -1000,6 +985,7 @@
            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;
@@ -1012,6 +998,7 @@
            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;
@@ -1025,6 +1012,7 @@
            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;
@@ -1038,6 +1026,7 @@
            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;
@@ -1056,15 +1045,25 @@
            // repositoryItemButtonEdit3
            // 
            this.repositoryItemButtonEdit3.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions4.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)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
@@ -1072,10 +1071,19 @@
            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, 5);
            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;
@@ -1086,18 +1094,12 @@
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_itemModel);
            this.panel1.Controls.Add(this.txt_ItemId);
            this.panel1.Controls.Add(this.txt_isenabled);
            this.panel1.Controls.Add(this.txt_ftwoChecked);
            this.panel1.Controls.Add(this.txt_foneChecked);
            this.panel1.Controls.Add(this.lb_itemModel);
            this.panel1.Controls.Add(this.labelCreateDate);
            this.panel1.Controls.Add(this.txt_createDate);
            this.panel1.Controls.Add(this.labelUserName);
            this.panel1.Controls.Add(this.txt_userName);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_tname);
            this.panel1.Controls.Add(this.txt_itemNo);
            this.panel1.Controls.Add(this.lb_isenabled);
            this.panel1.Controls.Add(this.lb_fversion);
            this.panel1.Controls.Add(this.txt_fversion);
            this.panel1.Controls.Add(this.lb_ftwoCheckdate);
@@ -1123,11 +1125,11 @@
            // txt_itemModel
            // 
            this.txt_itemModel.Enabled = false;
            this.txt_itemModel.Location = new System.Drawing.Point(85, 96);
            this.txt_itemModel.Location = new System.Drawing.Point(85, 86);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
            this.txt_itemModel.Size = new System.Drawing.Size(266, 64);
            this.txt_itemModel.Size = new System.Drawing.Size(262, 64);
            this.txt_itemModel.TabIndex = 381;
            this.txt_itemModel.Tag = "itemName";
            // 
@@ -1140,18 +1142,10 @@
            this.txt_ItemId.TabIndex = 380;
            this.txt_ItemId.Tag = "no";
            // 
            // txt_isenabled
            //
            this.txt_isenabled.Location = new System.Drawing.Point(1062, 96);
            this.txt_isenabled.Name = "txt_isenabled";
            this.txt_isenabled.Properties.Caption = "";
            this.txt_isenabled.Size = new System.Drawing.Size(27, 24);
            this.txt_isenabled.TabIndex = 379;
            //
            // txt_ftwoChecked
            // 
            this.txt_ftwoChecked.Enabled = false;
            this.txt_ftwoChecked.Location = new System.Drawing.Point(685, 96);
            this.txt_ftwoChecked.Location = new System.Drawing.Point(434, 86);
            this.txt_ftwoChecked.Name = "txt_ftwoChecked";
            this.txt_ftwoChecked.Properties.Caption = "";
            this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24);
@@ -1160,7 +1154,7 @@
            // txt_foneChecked
            // 
            this.txt_foneChecked.Enabled = false;
            this.txt_foneChecked.Location = new System.Drawing.Point(928, 96);
            this.txt_foneChecked.Location = new System.Drawing.Point(434, 125);
            this.txt_foneChecked.Name = "txt_foneChecked";
            this.txt_foneChecked.Properties.Caption = "";
            this.txt_foneChecked.Size = new System.Drawing.Size(94, 24);
@@ -1170,51 +1164,11 @@
            // 
            this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemModel.Appearance.Options.UseFont = true;
            this.lb_itemModel.Location = new System.Drawing.Point(9, 96);
            this.lb_itemModel.Location = new System.Drawing.Point(9, 86);
            this.lb_itemModel.Name = "lb_itemModel";
            this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
            this.lb_itemModel.TabIndex = 375;
            this.lb_itemModel.Text = "物料规格";
            //
            // labelCreateDate
            //
            this.labelCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelCreateDate.Appearance.Options.UseFont = true;
            this.labelCreateDate.Location = new System.Drawing.Point(360, 59);
            this.labelCreateDate.Name = "labelCreateDate";
            this.labelCreateDate.Size = new System.Drawing.Size(68, 21);
            this.labelCreateDate.TabIndex = 373;
            this.labelCreateDate.Text = "制作日期";
            //
            // txt_createDate
            //
            this.txt_createDate.Enabled = false;
            this.txt_createDate.Location = new System.Drawing.Point(433, 55);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
            this.txt_createDate.Size = new System.Drawing.Size(175, 28);
            this.txt_createDate.TabIndex = 374;
            //
            // labelUserName
            //
            this.labelUserName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelUserName.Appearance.Options.UseFont = true;
            this.labelUserName.Location = new System.Drawing.Point(377, 20);
            this.labelUserName.Name = "labelUserName";
            this.labelUserName.Size = new System.Drawing.Size(51, 21);
            this.labelUserName.TabIndex = 371;
            this.labelUserName.Text = "制作人";
            //
            // txt_userName
            //
            this.txt_userName.Enabled = false;
            this.txt_userName.Location = new System.Drawing.Point(433, 16);
            this.txt_userName.Name = "txt_userName";
            this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_userName.Properties.Appearance.Options.UseFont = true;
            this.txt_userName.Size = new System.Drawing.Size(175, 28);
            this.txt_userName.TabIndex = 372;
            // 
            // lbGuid
            // 
@@ -1268,7 +1222,7 @@
            this.xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.xtraTabPage3.ResumeLayout(false);
            this.xtraTabPageCopy.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
@@ -1277,11 +1231,8 @@
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -1317,8 +1268,6 @@
private DevExpress.XtraEditors.LabelControl lb_tname;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.LabelControl lb_isenabled;
 private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
private DevExpress.XtraEditors.LabelControl lb_fversion;
@@ -1358,14 +1307,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
        private DevExpress.XtraEditors.LabelControl labelCreateDate;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private DevExpress.XtraEditors.LabelControl labelUserName;
        private DevExpress.XtraEditors.TextEdit txt_userName;
        private DevExpress.XtraEditors.LabelControl lb_itemModel;
        private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
        private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
        private DevExpress.XtraEditors.CheckEdit txt_isenabled;
        private UserControl.UcLookItems txt_ItemId;
        private DevExpress.XtraEditors.MemoEdit txt_itemModel;
        private DevExpress.XtraEditors.SimpleButton btnSelect;
@@ -1379,7 +1323,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private DevExpress.XtraTab.XtraTabPage xtraTabPageCopy;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraGrid.GridControl gridControl2;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
@@ -1390,5 +1334,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
        private DevExpress.XtraEditors.SimpleButton btnSave;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
@@ -31,15 +30,16 @@
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "foneChecked", "");
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //初始化物料选择和各种下拉
            _setIno();
            btnSave.Click += BtnSave_Click;
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
@@ -102,39 +102,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemNo, gridView1);
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1);
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        ///     反审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            _toolCk(2);
        }
        /// <summary>
@@ -144,11 +112,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            _toolCk(1);
        }
        /// <summary>
        ///     取消事件
@@ -167,37 +131,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】的检验标准,确定删除吗?"))
                return;
            var lst = new List<dynamic>();
            lst.Add(rowGuid);
            var _obj = lst;
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "DeleteModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn =
                    UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1);
                }
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
            _toolCk(-1);
        }
        /// <summary>
@@ -237,6 +171,7 @@
                return;
            }
            getModel(rowGuid, true, 1);
        }
        /// <summary>
@@ -254,6 +189,7 @@
            UtilityHelper.CleanValueByControl(panel1.Controls, true,
                gridViews);
            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            xtraTabPageCopy.PageEnabled = false;
        }
        /// <summary>
@@ -264,8 +200,8 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            string _ItemId = txt_ItemId.GetId()
; if (string.IsNullOrEmpty(_ItemId))
            string _ItemId = txt_ItemId.GetId();
            if (string.IsNullOrEmpty(_ItemId))
            {
                MsgHelper.Warning("请选择物料!");
                txt_ItemId.Focus();
@@ -294,14 +230,12 @@
                        FdownAllow = row["FdownAllow"].ToString(),
                    });
            }
            var _obj = new MesQmCheckitem
            {
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                ItemId = long.Parse(_ItemId),
                Memo = txt_memo.Text.Trim(),
                ItemNo = txt_itemNo.Text.Trim(),
                Isenabled = txt_isenabled.Checked,
                Ftype = "1",
                Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
                list = lst
@@ -336,7 +270,6 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
                "a.create_date", "asc", "", _sbSqlWhere.ToString());
@@ -383,8 +316,8 @@
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            xtraTabPageCopy.PageEnabled = !isEdit;
            var _obj = new
            {
                guid = strGuid //主建
@@ -423,6 +356,8 @@
                        UtilityHelper.SetDefaultTable(gcMx1,
                            gvMx1);
                    }
                    UtilityHelper.SetDefaultTable(gridControl2,
                         gridView2);
                }
                else
                {
@@ -435,36 +370,65 @@
            }
        }
        /// <summary>
        /// 工具条事件
        /// </summary>
        /// <param name="inFieldValue"></param>
        private void _toolCk(int _inFieldValue)
        {
            string strMsg = "";
            switch (_inFieldValue)
            {
                case -1:
                    strMsg = "删除";
                    break;
                case 1:
                    strMsg = "审核";
                    break;
                case 2:
                    strMsg = "批准";
                    break;
            };
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
                return;
            var _obj = new
            {
                guid = rowGuid,
                inFieldValue = _inFieldValue,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                        getModel(lbGuid.Text.Trim(), false, 999);
                    else
                        getPageList(1);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        #region 以下为种种下拉
        private  DataTable ListToTable<T>(List<T> items)
        {
            DataTable dataTable = new DataTable(typeof(T).Name);
            // 获取所有的属性
            PropertyInfo[] Props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
            foreach (PropertyInfo prop in Props)
            {
                // 设置列的名字和数据类型
                dataTable.Columns.Add(prop.Name, Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType);
            }
            // 遍历所有的对象
            foreach (T item in items)
            {
                var values = new object[Props.Length];
                for (int i = 0; i < Props.Length; i++)
                {
                    // 插入属性值到datatable
                    values[i] = Props[i].GetValue(item, null);
                }
                dataTable.Rows.Add(values);
            }
            return dataTable;
        }
        private void _setIno()
        {
            txt_ItemId.EditChanged += (s, e) =>
@@ -477,11 +441,17 @@
                var frm = new SelectCheckDt();
                frm.UpdateParent += (ss, ee) =>
                {
                    var lst = new List<dynamic>();
                    lst = ee.DynamicList;
                    DataTable table = ListToTable(lst);
                    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]);
                    }
                    gridControl2.BindingContext = new BindingContext();
                    gridControl2.DataSource = table;
                    gridControl2.DataSource = _oldTable;
                    gridControl2.ForceInitialize();
                };
                frm.ShowDialog();
@@ -659,6 +629,73 @@
            }
        }
        #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()
            };
            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/QiTa/Frm_MesInvItemMoves.cs
@@ -45,12 +45,6 @@
                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                e.Graphics.DrawString(str, f, Brushes.Gray, r);
            };
            gvMx1.ValidatingEditor += (sender, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.SetValidatingEditor(sender, e);
            };
            var _obj = new
            {
                currentPage = 1,
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -162,6 +162,7 @@
    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
    </Reference>
    <Reference Include="System.Web" />
    <Reference Include="System.Web.Extensions" />
    <Reference Include="System.Xaml" />
    <Reference Include="System.Xml.Linq" />
@@ -1058,6 +1059,7 @@
    <None Include="Resources\renamedatasource_16x161.png" />
    <None Include="Resources\deletelist2_16x16.png" />
    <None Include="Resources\reset_16x16.png" />
    <None Include="Resources\exportfile_16x161.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -763,6 +763,16 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap exportfile_16x161 {
            get {
                object obj = ResourceManager.GetObject("exportfile_16x161", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap exportfile_32x32 {
            get {
                object obj = ResourceManager.GetObject("exportfile_32x32", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,6 +124,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="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -135,8 +140,18 @@
  <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="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="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -198,10 +213,8 @@
            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 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="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>
@@ -227,6 +240,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <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="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -234,9 +250,6 @@
  </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="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="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -265,9 +278,6 @@
    <value>..\Resources\logo_png.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="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,
@@ -289,11 +299,19 @@
  <data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_32x321.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,
            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="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
  <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="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>
@@ -458,9 +476,6 @@
            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="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -529,9 +544,6 @@
            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>
  <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,
@@ -549,11 +561,6 @@
  </data>
  <data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dropandhighlowlines_16x16.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>
@@ -599,6 +606,11 @@
            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>
  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -619,9 +631,6 @@
  </data>
  <data name="sortasc_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_32x32.png;System.Drawing.Bitmap, 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="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap,
@@ -705,8 +714,11 @@
            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,
  <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>
@@ -724,10 +736,8 @@
    <value>..\Resources\login_bg6.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,
@@ -739,29 +749,22 @@
            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="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>
@@ -779,13 +782,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <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="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
  <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="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="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>
@@ -819,8 +822,8 @@
  <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>
@@ -832,7 +835,7 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</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 name="exportfile_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\exportfile_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/exportfile_16x161.png
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1430,6 +1430,24 @@
                    e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                e.Graphics.DrawString(str, f, Brushes.Gray, r);
            };
            gridView1.ValidatingEditor += (sender, e) =>
            {
                //yz_quantity_0
                GridView view = sender as GridView;
                if (view.FocusedColumn.Tag != null && view.FocusedColumn.Tag.ToString().StartsWith("yz_"))
                {
                    string[] _ary = view.FocusedColumn.Tag.ToString().Split('_');
                    if (_ary.Length > 2)
                    {
                        if (_ary[2] == "0")
                        {
                            double price = 0; if (!Double.TryParse(e.Value as String, out price))
                            { e.Valid = false; e.ErrorText = "请输入正确的数字."; }
                            return;
                        }
                    }
                }
            };
        }
        #endregion
@@ -1440,29 +1458,7 @@
            return regex.IsMatch(str);
        }
        /// <summary>
        /// yz_quantity_0,yz_字段_类型
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        public static void SetValidatingEditor(object sender, BaseContainerValidateEditorEventArgs e)
        {
            //yz_quantity_0
            GridView view = sender as GridView;
            if (view.FocusedColumn.Tag != null && view.FocusedColumn.Tag.ToString().StartsWith("yz_"))
            {
                string[] _ary = view.FocusedColumn.Tag.ToString().Split('_');
                if (_ary.Length > 2)
                {
                    if (_ary[2] == "0")
                    {
                        double price = 0; if (!Double.TryParse(e.Value as String, out price))
                        { e.Valid = false; e.ErrorText = "请输入正确的数字."; }
                        return;
                    }
                }
            }
        }
    }
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -178,9 +178,10 @@
        private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnFChkClick != null)
            {
                btnFChkClick(this, e);
            else
                return;
            }
            if (string.IsNullOrEmpty(guidKey))
            {
@@ -204,10 +205,10 @@
        private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnChkClick != null)
            {
                btnChkClick(this, e);
            else
                return;
            }
            if (string.IsNullOrEmpty(chkParameter))
            {
                //MsgHelper.ShowError("没有指定审核参数,请联系开发人员获取支持!");