lu
2025-05-26 1e70760fdbd1b09a8b697e97906d86235095d6c3
工单
已添加1个文件
已修改11个文件
877 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 330 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 95 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Program.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 335 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/exporttoxls_16x16.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -94,7 +94,7 @@
        /// <param name="e"></param>
        private void BtnLoad_Click(object sender, EventArgs e)
        {
            if (!MsgHelper.AskQuestion("确定重新加载检验项目吗,该操作将会清空之前的检验记录?"))
            if (!MsgHelper.AskQuestion("该操作将会清空检验记录(包括样品检验记录),确定重新加载检验项目吗?"))
                return;
            string strGuid = lbGuid.Text.Trim();
            if (string.IsNullOrEmpty(strGuid))
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
@@ -13,6 +13,12 @@
        string _webServiceName = "MesQaItemsDetect01Manager/";
        private string dt01Guid = "";
        bool isEdit = false;
        /// <summary>
        ///
        /// </summary>
        /// <param name="_dt01Guid">MES_QA_ITEMS_DETECT_01表GUidance</param>
        /// <param name="_blEdit">是否可编辑</param>
        public Frm_MesQaItemsDetect01Input(string _dt01Guid, bool _blEdit)
        {
            InitializeComponent();
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -1044,7 +1044,7 @@
            // gvMx1guid
            // 
            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
            this.gvMx1guid.Caption = "主键GUID";
            this.gvMx1guid.Caption = "到货明细GUID";
            this.gvMx1guid.FieldName = "guid";
            this.gvMx1guid.MinWidth = 70;
            this.gvMx1guid.Name = "gvMx1guid";
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -62,6 +62,13 @@
            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -212,7 +219,6 @@
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -222,13 +228,11 @@
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -267,7 +271,20 @@
            this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panMx100 = new System.Windows.Forms.Panel();
            this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
            this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.txt_zQty100 = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty100 = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty100 = new DevExpress.XtraEditors.TextEdit();
            this.txt_iCount_100 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -372,7 +389,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
@@ -395,6 +412,19 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
            this.panMx100.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layMx100)).BeginInit();
            this.layMx100.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty100.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty100.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_100.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -2230,7 +2260,7 @@
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.rptChongDa});
            this.gcMx2.Size = new System.Drawing.Size(1648, 386);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -2244,7 +2274,6 @@
            this.gvMx2.ColumnPanelRowHeight = 50;
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx2guid,
            this.gridColumn20,
            this.gridColumn19,
            this.gvMx2itemBarcode,
            this.gvMx2quantity,
@@ -2254,8 +2283,6 @@
            this.gridColumn17,
            this.gvMx2createBy,
            this.gvMx2createDate,
            this.gridColumn28,
            this.gridColumn29,
            this.gridColumn30,
            this.gridColumn31,
            this.gridColumn32,
@@ -2277,17 +2304,6 @@
            this.gvMx2guid.Tag = "query_a.guid";
            this.gvMx2guid.Width = 94;
            // 
            // gridColumn20
            //
            this.gridColumn20.Caption = "报工标识";
            this.gridColumn20.FieldName = "isBg";
            this.gridColumn20.MaxWidth = 50;
            this.gridColumn20.MinWidth = 50;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 0;
            this.gridColumn20.Width = 50;
            //
            // gridColumn19
            // 
            this.gridColumn19.Caption = "入库标识";
@@ -2296,7 +2312,7 @@
            this.gridColumn19.MinWidth = 50;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 1;
            this.gridColumn19.VisibleIndex = 0;
            this.gridColumn19.Width = 50;
            // 
            // gvMx2itemBarcode
@@ -2308,7 +2324,7 @@
            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx2itemBarcode.Visible = true;
            this.gvMx2itemBarcode.VisibleIndex = 2;
            this.gvMx2itemBarcode.VisibleIndex = 1;
            this.gvMx2itemBarcode.Width = 94;
            // 
            // gvMx2quantity
@@ -2322,7 +2338,7 @@
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计:{0:0.##}")});
            this.gvMx2quantity.Tag = "query_a.QUANTITY";
            this.gvMx2quantity.Visible = true;
            this.gvMx2quantity.VisibleIndex = 3;
            this.gvMx2quantity.VisibleIndex = 2;
            this.gvMx2quantity.Width = 94;
            // 
            // gvMx2unit
@@ -2334,7 +2350,7 @@
            this.gvMx2unit.Name = "gvMx2unit";
            this.gvMx2unit.Tag = "query_a.UNIT";
            this.gvMx2unit.Visible = true;
            this.gvMx2unit.VisibleIndex = 4;
            this.gvMx2unit.VisibleIndex = 3;
            this.gvMx2unit.Width = 94;
            // 
            // gridColumn18
@@ -2344,7 +2360,7 @@
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 5;
            this.gridColumn18.VisibleIndex = 4;
            this.gridColumn18.Width = 94;
            // 
            // gvMx2itemSname
@@ -2356,7 +2372,7 @@
            this.gvMx2itemSname.Name = "gvMx2itemSname";
            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
            this.gvMx2itemSname.Visible = true;
            this.gvMx2itemSname.VisibleIndex = 6;
            this.gvMx2itemSname.VisibleIndex = 5;
            this.gvMx2itemSname.Width = 94;
            // 
            // gridColumn17
@@ -2366,7 +2382,7 @@
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 7;
            this.gridColumn17.VisibleIndex = 6;
            this.gridColumn17.Width = 94;
            // 
            // gvMx2createBy
@@ -2378,7 +2394,7 @@
            this.gvMx2createBy.Name = "gvMx2createBy";
            this.gvMx2createBy.Tag = "query_a.CREATE_BY";
            this.gvMx2createBy.Visible = true;
            this.gvMx2createBy.VisibleIndex = 8;
            this.gvMx2createBy.VisibleIndex = 7;
            this.gvMx2createBy.Width = 94;
            // 
            // gvMx2createDate
@@ -2390,28 +2406,8 @@
            this.gvMx2createDate.Name = "gvMx2createDate";
            this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
            this.gvMx2createDate.Visible = true;
            this.gvMx2createDate.VisibleIndex = 9;
            this.gvMx2createDate.VisibleIndex = 8;
            this.gvMx2createDate.Width = 94;
            //
            // gridColumn28
            //
            this.gridColumn28.Caption = "报工人";
            this.gridColumn28.FieldName = "bgYg";
            this.gridColumn28.MinWidth = 25;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 10;
            this.gridColumn28.Width = 94;
            //
            // gridColumn29
            //
            this.gridColumn29.Caption = "报工时间";
            this.gridColumn29.FieldName = "bgTime";
            this.gridColumn29.MinWidth = 25;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 11;
            this.gridColumn29.Width = 94;
            // 
            // gridColumn30
            // 
@@ -2420,7 +2416,7 @@
            this.gridColumn30.MinWidth = 25;
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Visible = true;
            this.gridColumn30.VisibleIndex = 12;
            this.gridColumn30.VisibleIndex = 9;
            this.gridColumn30.Width = 94;
            // 
            // gridColumn31
@@ -2430,7 +2426,7 @@
            this.gridColumn31.MinWidth = 25;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 13;
            this.gridColumn31.VisibleIndex = 10;
            this.gridColumn31.Width = 94;
            // 
            // gridColumn32
@@ -2440,29 +2436,29 @@
            this.gridColumn32.MinWidth = 25;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 14;
            this.gridColumn32.VisibleIndex = 11;
            this.gridColumn32.Width = 94;
            // 
            // gvBtnAlawys
            // 
            this.gvBtnAlawys.Caption = "移出";
            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvBtnAlawys.Caption = "重打";
            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
            this.gvBtnAlawys.MinWidth = 25;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 15;
            this.gvBtnAlawys.VisibleIndex = 12;
            this.gvBtnAlawys.Width = 94;
            // 
            // repositoryItemButtonEdit1
            // rptChongDa
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            this.rptChongDa.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "重打", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.rptChongDa.Name = "rptChongDa";
            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // xtraTabPage3
            // 
@@ -2787,10 +2783,10 @@
            // gcMx4
            // 
            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx4.Location = new System.Drawing.Point(0, 54);
            this.gcMx4.Location = new System.Drawing.Point(0, 56);
            this.gcMx4.MainView = this.gvMx4;
            this.gcMx4.Name = "gcMx4";
            this.gcMx4.Size = new System.Drawing.Size(1648, 427);
            this.gcMx4.Size = new System.Drawing.Size(1648, 425);
            this.gcMx4.TabIndex = 2;
            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx4});
@@ -2911,22 +2907,185 @@
            // 
            // panMx100
            // 
            this.panMx100.Controls.Add(this.ucBtnPrint100);
            this.panMx100.Controls.Add(this.layMx100);
            this.panMx100.Dock = System.Windows.Forms.DockStyle.Top;
            this.panMx100.Location = new System.Drawing.Point(0, 0);
            this.panMx100.Name = "panMx100";
            this.panMx100.Size = new System.Drawing.Size(1648, 54);
            this.panMx100.Size = new System.Drawing.Size(1648, 56);
            this.panMx100.TabIndex = 0;
            //
            // layMx100
            //
            this.layMx100.Controls.Add(this.ucBtnPrint100);
            this.layMx100.Controls.Add(this.btnIn);
            this.layMx100.Controls.Add(this.txt_zQty100);
            this.layMx100.Controls.Add(this.txt_yQty100);
            this.layMx100.Controls.Add(this.txt_kQty100);
            this.layMx100.Controls.Add(this.txt_iCount_100);
            this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layMx100.Location = new System.Drawing.Point(0, 0);
            this.layMx100.Name = "layMx100";
            this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(359, 336, 812, 500);
            this.layMx100.Root = this.layoutControlGroup4;
            this.layMx100.Size = new System.Drawing.Size(1648, 56);
            this.layMx100.TabIndex = 2;
            this.layMx100.Text = "dataLayoutControl1";
            // 
            // ucBtnPrint100
            // 
            this.ucBtnPrint100.guidKey = null;
            this.ucBtnPrint100.Location = new System.Drawing.Point(20, 10);
            this.ucBtnPrint100.Location = new System.Drawing.Point(1154, 12);
            this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint100.Name = "ucBtnPrint100";
            this.ucBtnPrint100.rptParameter = null;
            this.ucBtnPrint100.Size = new System.Drawing.Size(232, 32);
            this.ucBtnPrint100.Size = new System.Drawing.Size(282, 32);
            this.ucBtnPrint100.TabIndex = 0;
            //
            // btnIn
            //
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
            this.btnIn.Location = new System.Drawing.Point(1440, 12);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(196, 27);
            this.btnIn.StyleController = this.layMx100;
            this.btnIn.TabIndex = 1;
            this.btnIn.Text = "导入条码";
            //
            // txt_zQty100
            //
            this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
            this.txt_zQty100.Name = "txt_zQty100";
            this.txt_zQty100.Properties.ReadOnly = true;
            this.txt_zQty100.Size = new System.Drawing.Size(178, 24);
            this.txt_zQty100.StyleController = this.layMx100;
            this.txt_zQty100.TabIndex = 4;
            //
            // txt_yQty100
            //
            this.txt_yQty100.Location = new System.Drawing.Point(398, 12);
            this.txt_yQty100.Name = "txt_yQty100";
            this.txt_yQty100.Properties.ReadOnly = true;
            this.txt_yQty100.Size = new System.Drawing.Size(180, 24);
            this.txt_yQty100.StyleController = this.layMx100;
            this.txt_yQty100.TabIndex = 5;
            //
            // txt_kQty100
            //
            this.txt_kQty100.Location = new System.Drawing.Point(684, 12);
            this.txt_kQty100.Name = "txt_kQty100";
            this.txt_kQty100.Properties.ReadOnly = true;
            this.txt_kQty100.Size = new System.Drawing.Size(180, 24);
            this.txt_kQty100.StyleController = this.layMx100;
            this.txt_kQty100.TabIndex = 6;
            //
            // txt_iCount_100
            //
            this.txt_iCount_100.Location = new System.Drawing.Point(970, 12);
            this.txt_iCount_100.Name = "txt_iCount_100";
            this.txt_iCount_100.Size = new System.Drawing.Size(180, 24);
            this.txt_iCount_100.StyleController = this.layMx100;
            this.txt_iCount_100.TabIndex = 7;
            //
            // layoutControlGroup4
            //
            this.layoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup4.GroupBordersVisible = false;
            this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem42,
            this.layoutControlItem43,
            this.layoutControlItem44,
            this.layoutControlItem2,
            this.layoutControlItem10,
            this.layoutControlItem45});
            this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup4.Name = "Root";
            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition18.Width = 100D;
            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition19.Width = 100D;
            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition20.Width = 100D;
            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition21.Width = 100D;
            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition22.Width = 100D;
            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
            columnDefinition23.Width = 200D;
            this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition18,
            columnDefinition19,
            columnDefinition20,
            columnDefinition21,
            columnDefinition22,
            columnDefinition23});
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition11});
            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 56);
            this.layoutControlGroup4.TextVisible = false;
            //
            // layoutControlItem42
            //
            this.layoutControlItem42.Control = this.txt_zQty100;
            this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem42.Name = "layoutControlItem42";
            this.layoutControlItem42.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem42.Text = "工单总量";
            this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem43
            //
            this.layoutControlItem43.Control = this.txt_yQty100;
            this.layoutControlItem43.Location = new System.Drawing.Point(284, 0);
            this.layoutControlItem43.Name = "layoutControlItem43";
            this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem43.Size = new System.Drawing.Size(286, 36);
            this.layoutControlItem43.Text = "已打印数";
            this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem44
            //
            this.layoutControlItem44.Control = this.txt_kQty100;
            this.layoutControlItem44.CustomizationFormText = "可打印数";
            this.layoutControlItem44.Location = new System.Drawing.Point(570, 0);
            this.layoutControlItem44.Name = "layoutControlItem44";
            this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem44.Size = new System.Drawing.Size(286, 36);
            this.layoutControlItem44.Text = "可打印数字";
            this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.btnIn;
            this.layoutControlItem2.Location = new System.Drawing.Point(1428, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
            this.layoutControlItem2.Size = new System.Drawing.Size(200, 36);
            this.layoutControlItem2.Text = "导入按钮";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem2.TextVisible = false;
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.ucBtnPrint100;
            this.layoutControlItem10.Location = new System.Drawing.Point(1142, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem10.Size = new System.Drawing.Size(286, 36);
            this.layoutControlItem10.Text = "打印按钮";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextVisible = false;
            //
            // layoutControlItem45
            //
            this.layoutControlItem45.Control = this.txt_iCount_100;
            this.layoutControlItem45.Location = new System.Drawing.Point(856, 0);
            this.layoutControlItem45.Name = "layoutControlItem45";
            this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem45.Size = new System.Drawing.Size(286, 36);
            this.layoutControlItem45.Text = "本次打印张数";
            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
            // 
            // Frm_Womdaa
            // 
@@ -3040,7 +3199,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
@@ -3063,6 +3222,19 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
            this.panMx100.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layMx100)).EndInit();
            this.layMx100.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty100.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty100.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_100.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
            this.ResumeLayout(false);
        }
@@ -3172,7 +3344,6 @@
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
@@ -3183,11 +3354,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
@@ -3274,5 +3443,18 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraDataLayout.DataLayoutControl layMx100;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private DevExpress.XtraEditors.TextEdit txt_zQty100;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42;
        private DevExpress.XtraEditors.TextEdit txt_yQty100;
        private DevExpress.XtraEditors.TextEdit txt_kQty100;
        private DevExpress.XtraEditors.TextEdit txt_iCount_100;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem44;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -27,10 +27,11 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick;
            this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
            this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
           // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
            this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -86,6 +87,7 @@
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -127,6 +129,49 @@
            getPageList(1);
        }
        /// <summary>
        /// 删除工单
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnDelClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
                return;
            var _obj = new
            {
                guid = rowGuid,
                mxGuid = Guid.Empty.ToString(),
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "DeleteModelOrMx",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// 生成首检
        /// </summary>
@@ -182,14 +227,19 @@
        {
            _toolCk(7);
        }
        private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
        {
            _toolCk(8);
        }
        //private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
        //{
        //    _toolCk(8);
        //}
        private void ToolBarMenu1_btnWgClick(object sender, EventArgs e)
        {
            _toolCk(9);
        }
        /// <summary>
        /// 工单状态,根据分号把中文去了
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnZhongTaiClick(object sender, EventArgs e)
        {
            var frm = new showZhongTai();
@@ -199,14 +249,6 @@
                _toolCk(_zt);
            };
            frm.ShowDialog();
        }
        private void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
        {
            _toolCk(7);
        }
        private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
        {
            _toolCk(8);
        }
        /// <summary>
        /// 日志
@@ -498,9 +540,9 @@
            string strMsg = "";
            switch (_inFieldValue)
            {
                case 1:
                    strMsg = "待开工";
                    break;
                //case 1:
                //    strMsg = "待开工";
                //    break;
                case 2:
                    strMsg = "工单暂停";
                    break;
@@ -513,15 +555,15 @@
                case 5:
                    strMsg = "暂停备料";
                    break;
                case 6:
                    strMsg = "撤回备料";
                    break;
                //case 6:
                //    strMsg = "撤回备料";
                //    break;
                case 7:
                    strMsg = "通知备料";
                    break;
                case 8:
                    strMsg = "开工";
                    break;
                //case 8:
                //    strMsg = "开工";
                //    break;
                case 9:
                    strMsg = "手动完工";
                    break;
@@ -666,8 +708,17 @@
                   + "," + ""
                   + "}";
        }
        /// <summary>
        /// 重打
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            MsgHelper.ShowInformation("功能开发中!");
            return;
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
@@ -53,7 +53,6 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.comZt.Properties.Items.AddRange(new object[] {
            "-请选择-",
            "1,D:待开工",
            "2,S:暂停",
            "3,Q:清尾",
            "4,紧急备料",
DevApp/Gs.DevApp/Program.cs
@@ -53,7 +53,8 @@
                fmLogin.ShowDialog();
                if (fmLogin.DialogResult == DialogResult.OK)
                {
                  //  Application.Run(new DevFrm.User.SysMenu());
                    //Application.Run(new DevFrm.User.SysMenu());
                    //return;
                    bool IsWeight = false;
                    try
                    {
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1213,6 +1213,16 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap exporttoxls_16x16 {
            get {
                object obj = ResourceManager.GetObject("exporttoxls_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap fill_16x16 {
            get {
                object obj = ResourceManager.GetObject("fill_16x16", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -121,16 +121,21 @@
  <data name="iconsetarrows3_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\iconsetarrows3_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_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,
  <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="zoom100_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zoom100_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -146,10 +151,8 @@
  <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 name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\inlinesizelegend_16x16.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>
@@ -157,16 +160,8 @@
  <data name="lookup&amp;reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -230,14 +225,6 @@
  <data name="error123" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\error123.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boreport2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boreport2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -255,19 +242,14 @@
  <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -281,13 +263,8 @@
  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -302,8 +279,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap,
@@ -324,17 +301,24 @@
  <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="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <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>
  </data>
  <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
  <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -351,6 +335,11 @@
  <data name="editname_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editname_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\find_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -358,24 +347,25 @@
  <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="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 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="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
@@ -400,16 +390,17 @@
  <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 name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -482,8 +473,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap,
@@ -536,11 +532,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -565,26 +556,16 @@
  <data name="boperson_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boperson_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -592,8 +573,8 @@
  <data name="user_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -605,6 +586,9 @@
    <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
@@ -627,6 +611,9 @@
  </data>
  <data name="user_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -656,9 +643,6 @@
  <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fontsizeincrease_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fontsizeincrease_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -679,13 +663,8 @@
  <data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="boreport2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boreport2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="subreport_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\subreport_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -695,6 +674,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -703,10 +685,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="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="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\last_16x16.png;System.Drawing.Bitmap,
@@ -757,19 +740,22 @@
  <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -784,8 +770,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
@@ -821,10 +809,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fontsizeincrease_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fontsizeincrease_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -845,9 +831,6 @@
  <data name="snapmodifytablecellstyle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\snapmodifytablecellstyle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -855,6 +838,9 @@
    <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -902,6 +888,11 @@
            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>
  <data name="group2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group2_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -917,27 +908,20 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="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 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="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap,
            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="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
@@ -947,11 +931,16 @@
  <data name="boreport2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boreport2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="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 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="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -966,22 +955,37 @@
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="copy_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\copy_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data 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="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>
  <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>
@@ -1008,8 +1012,10 @@
  <data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x16.png;System.Drawing.Bitmap,
@@ -1019,33 +1025,33 @@
  <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="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="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="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="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodetails_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x16.png;System.Drawing.Bitmap,
  <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1055,24 +1061,18 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1082,6 +1082,11 @@
  </data>
  <data name="trackingchanges_previous_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_16x161.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,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x324" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1095,28 +1100,26 @@
  <data name="chartselectdata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\chartselectdata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\find_16x16.png;System.Drawing.Bitmap,
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
  <data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="copy_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\copy_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="exporttoxls_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\exporttoxls_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/exporttoxls_16x16.png
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2016,51 +2016,51 @@
                }
            };
            gridView1.RowStyle += (s, e) =>
            {
                //默认选中行不变色
                gridView1.OptionsSelection.EnableAppearanceFocusedRow = false;
                //默认选中单元格不变色
                gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;
                if (e.RowHandle >= 0)
                {
                    DataRow row = gridView1.GetDataRow(e.RowHandle);
                    if (row == null)
                        return;
                    //这是danger色
                    bool columnExists = row.Table.Columns.Contains("isRed");
                    if (columnExists == true)
                    {
                        string _isRed = row["isRed"].ToString();
                        if (_isRed == "1")
                        {
                            e.Appearance.ForeColor = Color.Tomato;
                        }
                    }
                    //这是success色
                    columnExists = row.Table.Columns.Contains("isSuccess");
                    if (columnExists == true)
                    {
                        string _isRed = row["isSuccess"].ToString();
                        if (_isRed == "1")
                        {
                            e.Appearance.ForeColor = Color.FromArgb(128, 255, 128);
                        }
                    }
                    // 设置焦点行的背景色
                    if (gridView1.GetRow(e.RowHandle) == gridView1.GetFocusedRow())
                    {
                        e.Appearance.BackColor = Color.Azure;
                        e.Appearance.BackColor2 = Color.LightSkyBlue;
                    }
                    //else if (gridView1.IsRowHotTracked(e.RowHandle))
                    //{
                    //    // 设置鼠标悬停行的背景色
                    //    e.Appearance.BackColor = Color.LightBlue;
                    //    e.Appearance.BackColor2 = Color.LightBlue;
                    //}
                }
            };
            //gridView1.RowStyle += (s, e) =>
            //{
            //    //默认选中行不变色
            //    gridView1.OptionsSelection.EnableAppearanceFocusedRow = false;
            //    //默认选中单元格不变色
            //    gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;
            //    if (e.RowHandle >= 0)
            //    {
            //        DataRow row = gridView1.GetDataRow(e.RowHandle);
            //        if (row == null)
            //            return;
            //        //这是danger色
            //        bool columnExists = row.Table.Columns.Contains("isRed");
            //        if (columnExists == true)
            //        {
            //            string _isRed = row["isRed"].ToString();
            //            if (_isRed == "1")
            //            {
            //                e.Appearance.ForeColor = Color.Tomato;
            //            }
            //        }
            //        //这是success色
            //        columnExists = row.Table.Columns.Contains("isSuccess");
            //        if (columnExists == true)
            //        {
            //            string _isRed = row["isSuccess"].ToString();
            //            if (_isRed == "1")
            //            {
            //                e.Appearance.ForeColor = Color.FromArgb(128, 255, 128);
            //            }
            //        }
            //        // 设置焦点行的背景色
            //        if (gridView1.GetRow(e.RowHandle) == gridView1.GetFocusedRow())
            //        {
            //            e.Appearance.BackColor = Color.Azure;
            //            e.Appearance.BackColor2 = Color.LightSkyBlue;
            //        }
            //        //else if (gridView1.IsRowHotTracked(e.RowHandle))
            //        //{
            //        //    // 设置鼠标悬停行的背景色
            //        //    e.Appearance.BackColor = Color.LightBlue;
            //        //    e.Appearance.BackColor2 = Color.LightBlue;
            //        //}
            //    }
            //};
        }
        #endregion
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -548,6 +548,9 @@
            lst.Add(btnHelp.Name);
            lst.Add(btnLayout.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnJianYan.Name);
            lst.Add(btnLog.Name);
            _enabledBtn(lst);
            this.currentAction = "edit";
            if (btnEdtClick != null) btnEdtClick(this, e);