1

lu

2025-03-10 f73f776ffbf1051eff523bd0205b89e381a41640

1

 DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs

@@ -60,6 +60,7 @@
            this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components);
            this.tabCloseCurrent = new System.Windows.Forms.ToolStripMenuItem();
            this.tabCloseAll = new System.Windows.Forms.ToolStripMenuItem();
            this.barMenu = new DevExpress.XtraBars.BarButtonItem();
            this.fluentDesignFormContainer1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
            this.strp1.SuspendLayout();
@@ -144,7 +145,8 @@
            this.barSubItem4,
            this.barEasy,
            this.barTxt,
            this.barOrg});
            this.barOrg,
            this.barMenu});
            this.fluentDesignFormControl1.Location = new System.Drawing.Point(0, 0);
            this.fluentDesignFormControl1.Manager = this.fdm1;
            this.fluentDesignFormControl1.Name = "fluentDesignFormControl1";
@@ -182,6 +184,7 @@
            this.barAbout.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barAbout.ImageOptions.Image")));
            this.barAbout.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barAbout.ImageOptions.LargeImage")));
            this.barAbout.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
            new DevExpress.XtraBars.LinkPersistInfo(this.barMenu),
            new DevExpress.XtraBars.LinkPersistInfo(this.barUs),
            new DevExpress.XtraBars.LinkPersistInfo(this.barHelp),
            new DevExpress.XtraBars.LinkPersistInfo(this.barEasy)});
@@ -314,8 +317,9 @@
            this.barSubItem4,
            this.barEasy,
            this.barTxt,
            this.barOrg});
            this.fdm1.MaxItemId = 36;
            this.barOrg,
            this.barMenu});
            this.fdm1.MaxItemId = 37;
            this.fdm1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemCheckedComboBoxEdit1});
            // 
@@ -358,6 +362,12 @@
            this.tabCloseAll.Name = "tabCloseAll";
            this.tabCloseAll.Size = new System.Drawing.Size(157, 26);
            this.tabCloseAll.Text = "关闭其它页";
            // 
            // barMenu
            // 
            this.barMenu.Caption = "功能菜单";
            this.barMenu.Id = 36;
            this.barMenu.Name = "barMenu";
            // 
            // FrmMain
            // 
@@ -418,5 +428,6 @@
        private DevExpress.XtraBars.BarStaticItem barTxt;
        private DevExpress.XtraBars.BarEditItem barOrg;
        private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1;
        private DevExpress.XtraBars.BarButtonItem barMenu;
    }
}

 DevApp/Gs.DevApp/DevFrm/FrmMain.cs

@@ -95,6 +95,11 @@
                    MsgHelper.Warning("提示：" + ex.Message);
                }
            };
            barMenu.ItemClick += (s, e) =>
            {
                Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
                frm.ShowDialog();
            };
        }

        private void Tab_MouseDown(object sender, MouseEventArgs e)

 DevApp/Gs.DevApp/DevFrm/FrmMain.resx

@@ -120,9 +120,6 @@
  <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>284, 17</value>
  </metadata>
  <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>284, 17</value>
  </metadata>
  <assembly alias="DevExpress.Data.v22.2" name="DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="barSubItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>

 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 editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = 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();
@@ -66,42 +66,23 @@
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.lb_tname = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_fversion = new DevExpress.XtraEditors.LabelControl();
            this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
            this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_ftwoCheckdate = new DevExpress.XtraEditors.LabelControl();
            this.txt_ftwoCheckdate = new DevExpress.XtraEditors.TextEdit();
            this.lb_ftwoCheckor = new DevExpress.XtraEditors.LabelControl();
            this.txt_ftwoCheckor = new DevExpress.XtraEditors.TextEdit();
            this.gv_ftwoCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_ftwoChecked = new DevExpress.XtraEditors.LabelControl();
            this.gv_ftwoChecked = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_foneCheckdate = new DevExpress.XtraEditors.LabelControl();
            this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
            this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_foneCheckor = new DevExpress.XtraEditors.LabelControl();
            this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
            this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_foneChecked = new DevExpress.XtraEditors.LabelControl();
            this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_memo = new DevExpress.XtraEditors.LabelControl();
            this.txt_memo = new DevExpress.XtraEditors.TextEdit();
            this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPageCopy = new DevExpress.XtraTab.XtraTabPage();
@@ -128,6 +109,26 @@
            this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            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.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
@@ -145,11 +146,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            this.xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
@@ -164,6 +162,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
            this.split1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
            this.split1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            this.SuspendLayout();
            // 
            // gvMx1pid
@@ -312,7 +318,6 @@
            this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptJYXM.Name = "rptJYXM";
           // this.rptJYXM.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            // 
            // gvMx1fupAllow
            // 
@@ -475,10 +480,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions7.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, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", 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);
@@ -503,22 +508,6 @@
            this.txt_itemNo.TabIndex = 370;
            this.txt_itemNo.Tag = "readOnly";
            // 
            // gv_isenabled
            // 
            this.gv_isenabled.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isenabled.AppearanceCell.Options.UseFont = true;
            this.gv_isenabled.Caption = "是否可用";
            this.gv_isenabled.FieldName = "isenabled";
            this.gv_isenabled.MaxWidth = 50;
            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.UnboundDataType = typeof(bool);
            this.gv_isenabled.Visible = true;
            this.gv_isenabled.VisibleIndex = 1;
            this.gv_isenabled.Width = 50;
            // 
            // lb_fversion
            // 
            this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -538,20 +527,6 @@
            this.txt_fversion.Properties.Appearance.Options.UseFont = true;
            this.txt_fversion.Size = new System.Drawing.Size(170, 28);
            this.txt_fversion.TabIndex = 298;
            // 
            // gv_fversion
            // 
            this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            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 = 4;
            this.gv_fversion.Width = 94;
            // 
            // lb_ftwoCheckdate
            // 
@@ -593,20 +568,6 @@
            this.txt_ftwoCheckor.TabIndex = 280;
            this.txt_ftwoCheckor.Tag = "readOnly";
            // 
            // gv_ftwoCheckor
            // 
            this.gv_ftwoCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            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;
            // 
            // lb_ftwoChecked
            // 
            this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -616,22 +577,6 @@
            this.lb_ftwoChecked.Size = new System.Drawing.Size(68, 21);
            this.lb_ftwoChecked.TabIndex = 273;
            this.lb_ftwoChecked.Text = "批准标记";
            // 
            // gv_ftwoChecked
            // 
            this.gv_ftwoChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            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 = 3;
            this.gv_ftwoChecked.Width = 50;
            // 
            // lb_foneCheckdate
            // 
@@ -653,20 +598,6 @@
            this.txt_foneCheckdate.TabIndex = 267;
            this.txt_foneCheckdate.Tag = "readOnly";
            // 
            // gv_foneCheckdate
            // 
            this.gv_foneCheckdate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
            this.gv_foneCheckdate.Caption = "审核时间";
            this.gv_foneCheckdate.FieldName = "foneCheckdate";
            this.gv_foneCheckdate.MinWidth = 50;
            this.gv_foneCheckdate.Name = "gv_foneCheckdate";
            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.Width = 120;
            // 
            // lb_foneCheckor
            // 
            this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -687,20 +618,6 @@
            this.txt_foneCheckor.TabIndex = 262;
            this.txt_foneCheckor.Tag = "readOnly";
            // 
            // gv_foneCheckor
            // 
            this.gv_foneCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
            this.gv_foneCheckor.Caption = "审核人";
            this.gv_foneCheckor.FieldName = "foneCheckor";
            this.gv_foneCheckor.MinWidth = 50;
            this.gv_foneCheckor.Name = "gv_foneCheckor";
            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.Width = 94;
            // 
            // lb_foneChecked
            // 
            this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -711,22 +628,6 @@
            this.lb_foneChecked.TabIndex = 258;
            this.lb_foneChecked.Text = "审批标记";
            // 
            // gv_foneChecked
            // 
            this.gv_foneChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
            this.gv_foneChecked.Caption = "审核标记";
            this.gv_foneChecked.FieldName = "foneChecked";
            this.gv_foneChecked.MaxWidth = 50;
            this.gv_foneChecked.MinWidth = 50;
            this.gv_foneChecked.Name = "gv_foneChecked";
            this.gv_foneChecked.OptionsColumn.AllowEdit = false;
            this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
            this.gv_foneChecked.UnboundDataType = typeof(bool);
            this.gv_foneChecked.Visible = true;
            this.gv_foneChecked.VisibleIndex = 2;
            this.gv_foneChecked.Width = 50;
            // 
            // lb_itemNo
            // 
            this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -736,20 +637,6 @@
            this.lb_itemNo.Size = new System.Drawing.Size(68, 21);
            this.lb_itemNo.TabIndex = 222;
            this.lb_itemNo.Text = "选择物料";
            // 
            // gv_itemNo
            // 
            this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemNo.Caption = "物料产品编码";
            this.gv_itemNo.FieldName = "itemNo";
            this.gv_itemNo.MinWidth = 50;
            this.gv_itemNo.Name = "gv_itemNo";
            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.Width = 150;
            // 
            // lb_memo
            // 
@@ -770,20 +657,6 @@
            this.txt_memo.Size = new System.Drawing.Size(170, 28);
            this.txt_memo.TabIndex = 219;
            // 
            // gv_memo
            // 
            this.gv_memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_memo.AppearanceCell.Options.UseFont = true;
            this.gv_memo.Caption = "备注";
            this.gv_memo.FieldName = "memo";
            this.gv_memo.MinWidth = 50;
            this.gv_memo.Name = "gv_memo";
            this.gv_memo.OptionsColumn.AllowEdit = false;
            this.gv_memo.Tag = "query_a.MEMO";
            this.gv_memo.Visible = true;
            this.gv_memo.VisibleIndex = 13;
            this.gv_memo.Width = 150;
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = " 0,0,0,0,000chk_mes_CHECKITEM";
@@ -799,149 +672,17 @@
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1127, 531);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
            // gridView1
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn8,
            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.gridColumn1,
            this.gridColumn4,
            this.gv_memo});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "使用组织";
            this.gridColumn8.FieldName = "fSubsidiary";
            this.gridColumn8.MinWidth = 50;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.OptionsColumn.AllowEdit = false;
            this.gridColumn8.Tag = "org.fnumber";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 0;
            this.gridColumn8.Width = 250;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "物料ID";
            this.gridColumn7.FieldName = "itemId";
            this.gridColumn7.MinWidth = 50;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.AllowEdit = false;
            this.gridColumn7.Tag = "query_a.ITEM_ID";
            this.gridColumn7.Width = 94;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料名称";
            this.gridColumn3.FieldName = "mc";
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.AllowEdit = false;
            this.gridColumn3.Tag = "query_b.item_name";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 250;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料规格";
            this.gridColumn2.FieldName = "gg";
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Tag = "query_b.item_model";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 100;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "制作人";
            this.gridColumn1.FieldName = "createBy";
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Tag = "query_a.CREATE_BY";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 11;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "制作时间";
            this.gridColumn4.FieldName = "createDate";
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Tag = "query_a.CREATE_DATE";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 12;
            this.gridColumn4.Width = 180;
            // 
            // xtraTabControl1
            // 
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage2;
            this.xtraTabControl1.Size = new System.Drawing.Size(1129, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            // 
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1127, 570);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 531);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1127, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            this.xtraTabPage2,
            this.xtraTabPage3});
            // 
            // xtraTabPage2
            // 
@@ -1080,10 +821,10 @@
            // repositoryItemButtonEdit3
            // 
            this.repositoryItemButtonEdit3.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions8.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, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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);
@@ -1243,6 +984,289 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // xtraTabPage3
            // 
            this.xtraTabPage3.Controls.Add(this.split1);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1127, 570);
            this.xtraTabPage3.Text = "xtraTabPage3";
            // 
            // split1
            // 
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
            // 
            // split1.split1_Panel1
            // 
            this.split1.Panel1.Controls.Add(this.gcMain);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            // 
            // split1.split1_Panel2
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1127, 570);
            this.split1.SplitterPosition = 558;
            this.split1.TabIndex = 0;
            // 
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1127, 519);
            this.gcMain.TabIndex = 2;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
            // gridView1
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn8,
            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.gridColumn1,
            this.gridColumn4,
            this.gv_memo});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "使用组织";
            this.gridColumn8.FieldName = "fSubsidiary";
            this.gridColumn8.MinWidth = 50;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.OptionsColumn.AllowEdit = false;
            this.gridColumn8.Tag = "org.fnumber";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 0;
            this.gridColumn8.Width = 250;
            // 
            // gv_isenabled
            // 
            this.gv_isenabled.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isenabled.AppearanceCell.Options.UseFont = true;
            this.gv_isenabled.Caption = "是否可用";
            this.gv_isenabled.FieldName = "isenabled";
            this.gv_isenabled.MaxWidth = 50;
            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.UnboundDataType = typeof(bool);
            this.gv_isenabled.Visible = true;
            this.gv_isenabled.VisibleIndex = 1;
            this.gv_isenabled.Width = 50;
            // 
            // gv_foneChecked
            // 
            this.gv_foneChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
            this.gv_foneChecked.Caption = "审核标记";
            this.gv_foneChecked.FieldName = "foneChecked";
            this.gv_foneChecked.MaxWidth = 50;
            this.gv_foneChecked.MinWidth = 50;
            this.gv_foneChecked.Name = "gv_foneChecked";
            this.gv_foneChecked.OptionsColumn.AllowEdit = false;
            this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
            this.gv_foneChecked.UnboundDataType = typeof(bool);
            this.gv_foneChecked.Visible = true;
            this.gv_foneChecked.VisibleIndex = 2;
            this.gv_foneChecked.Width = 50;
            // 
            // gv_ftwoChecked
            // 
            this.gv_ftwoChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            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 = 3;
            this.gv_ftwoChecked.Width = 50;
            // 
            // gv_fversion
            // 
            this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            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 = 4;
            this.gv_fversion.Width = 94;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "物料ID";
            this.gridColumn7.FieldName = "itemId";
            this.gridColumn7.MinWidth = 50;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.AllowEdit = false;
            this.gridColumn7.Tag = "query_a.ITEM_ID";
            this.gridColumn7.Width = 94;
            // 
            // gv_itemNo
            // 
            this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemNo.Caption = "物料产品编码";
            this.gv_itemNo.FieldName = "itemNo";
            this.gv_itemNo.MinWidth = 50;
            this.gv_itemNo.Name = "gv_itemNo";
            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.Width = 150;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料名称";
            this.gridColumn3.FieldName = "mc";
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.AllowEdit = false;
            this.gridColumn3.Tag = "query_b.item_name";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 250;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料规格";
            this.gridColumn2.FieldName = "gg";
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Tag = "query_b.item_model";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 100;
            // 
            // gv_foneCheckor
            // 
            this.gv_foneCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
            this.gv_foneCheckor.Caption = "审核人";
            this.gv_foneCheckor.FieldName = "foneCheckor";
            this.gv_foneCheckor.MinWidth = 50;
            this.gv_foneCheckor.Name = "gv_foneCheckor";
            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.Width = 94;
            // 
            // gv_foneCheckdate
            // 
            this.gv_foneCheckdate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
            this.gv_foneCheckdate.Caption = "审核时间";
            this.gv_foneCheckdate.FieldName = "foneCheckdate";
            this.gv_foneCheckdate.MinWidth = 50;
            this.gv_foneCheckdate.Name = "gv_foneCheckdate";
            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.Width = 120;
            // 
            // gv_ftwoCheckor
            // 
            this.gv_ftwoCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            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;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "制作人";
            this.gridColumn1.FieldName = "createBy";
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Tag = "query_a.CREATE_BY";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 11;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "制作时间";
            this.gridColumn4.FieldName = "createDate";
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Tag = "query_a.CREATE_DATE";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 12;
            this.gridColumn4.Width = 180;
            // 
            // gv_memo
            // 
            this.gv_memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_memo.AppearanceCell.Options.UseFont = true;
            this.gv_memo.Caption = "备注";
            this.gv_memo.FieldName = "memo";
            this.gv_memo.MinWidth = 50;
            this.gv_memo.Name = "gv_memo";
            this.gv_memo.OptionsColumn.AllowEdit = false;
            this.gv_memo.Tag = "query_a.MEMO";
            this.gv_memo.Visible = true;
            this.gv_memo.VisibleIndex = 13;
            this.gv_memo.Width = 150;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1127, 39);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // Frm_MesQmCheckitemDt
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1270,11 +1294,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            this.xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
@@ -1290,17 +1311,21 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
            this.split1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
            this.split1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            this.ResumeLayout(false);

        }
        #endregion
      private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private UserControls.Data.UcPageBar pageBar1;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label lbGuid;
  private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -1324,43 +1349,30 @@

private DevExpress.XtraEditors.LabelControl lb_tname;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;

private DevExpress.XtraEditors.LabelControl lb_fversion;
private DevExpress.XtraEditors.TextEdit txt_fversion;
 private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;

private DevExpress.XtraEditors.LabelControl lb_ftwoCheckdate;
private DevExpress.XtraEditors.TextEdit txt_ftwoCheckdate;

private DevExpress.XtraEditors.LabelControl lb_ftwoCheckor;
private DevExpress.XtraEditors.TextEdit txt_ftwoCheckor;
 private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckor;

private DevExpress.XtraEditors.LabelControl lb_ftwoChecked;
 private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoChecked;

private DevExpress.XtraEditors.LabelControl lb_foneCheckdate;
private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
 private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckdate;

private DevExpress.XtraEditors.LabelControl lb_foneCheckor;
private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
 private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;

private DevExpress.XtraEditors.LabelControl lb_foneChecked;
 private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;

private DevExpress.XtraEditors.LabelControl lb_itemNo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;

private DevExpress.XtraEditors.LabelControl lb_memo;
private DevExpress.XtraEditors.TextEdit txt_memo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
        private DevExpress.XtraEditors.LabelControl lb_itemModel;
@@ -1374,8 +1386,6 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private System.Windows.Forms.PictureBox picCheckBox;
@@ -1395,5 +1405,25 @@
        private UserControl.UcLookOrg txt_fSubsidiary;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        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;
        private UserControls.Data.UcPageBar pageBar1;
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs

@@ -236,7 +236,6 @@
                return;
            }
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            if (gvMx1.DataRowCount <= 0)
            {
@@ -681,7 +680,6 @@
                string _val = _itm.Value.ToString();
                string _txt = _itm.Text.ToString();
                gvMx1.CloseEditor();
                gvMx1.PostEditor();
                gvMx1.UpdateCurrentRow();
                gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
                gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
@@ -690,7 +688,6 @@
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)

 DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs

@@ -90,7 +90,7 @@
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(794, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(1084, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
@@ -101,7 +101,7 @@
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(794, 507);
            this.xtraTabControl1.Size = new System.Drawing.Size(1084, 662);
            this.xtraTabControl1.TabIndex = 4;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
@@ -111,7 +111,7 @@
            // 
            this.xtraTabPage1.Controls.Add(this.tlMenu);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(792, 475);
            this.xtraTabPage1.Size = new System.Drawing.Size(1082, 630);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // tlMenu
@@ -134,7 +134,7 @@
            this.tlMenu.Name = "tlMenu";
            this.tlMenu.OptionsBehavior.Editable = false;
            this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
            this.tlMenu.Size = new System.Drawing.Size(792, 475);
            this.tlMenu.Size = new System.Drawing.Size(1082, 630);
            this.tlMenu.TabIndex = 3;
            this.tlMenu.TreeLevelWidth = 21;
            // 
@@ -202,7 +202,7 @@
            // 
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(792, 475);
            this.xtraTabPage2.Size = new System.Drawing.Size(1082, 630);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // panel1
@@ -503,10 +503,14 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(794, 587);
            this.ClientSize = new System.Drawing.Size(1084, 742);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "SysMenu";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "功能菜单";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);

 DevApp/Gs.DevApp/Properties/licenses.licx

@@ -6,4 +6,7 @@
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.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.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, 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.ImageComboBoxEdit, 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.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a