1

lu

2024-11-20 0d17767e55e30467f5a96947f5db89abf4834dd8

1

 DevApp/Gs.DevApp/App.config

@@ -28,8 +28,8 @@
        </assemblyBinding>
    </runtime>
    <appSettings>
         <add key="WebApiUrl" value="http://localhost:5263/" />
    <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
    <add key="WebApiUrl" value="http://192.168.1.145:81/" />
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="广深科技 G-MES V2.0" />
        <add key="PageSize" value="50" />

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs

@@ -17,6 +17,7 @@
        public Frm_Womcaa()
        {
            InitializeComponent();
            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick;
@@ -97,6 +98,23 @@
                getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
        ///     ä¿®æ”¹äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_caa001, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            getModel(rowGuid, true, 1);
        }
        /// <summary>
        /// åç»“案
        /// </summary>
        /// <param name="sender"></param>

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -891,6 +891,7 @@
    <None Include="Resources\add_32x32.png" />
    <None Include="Resources\changedatasourcepivottable_32x32.png" />
    <None Include="Resources\showworktimeonly_32x32.png" />
    <None Include="Resources\open2.svg" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />

 DevApp/Gs.DevApp/Properties/Resources.Designer.cs

@@ -1051,6 +1051,16 @@
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ DevExpress.Utils.Svg.SvgImage ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static DevExpress.Utils.Svg.SvgImage open2 {
            get {
                object obj = ResourceManager.GetObject("open2", resourceCulture);
                return ((DevExpress.Utils.Svg.SvgImage)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap printlayoutview_16x16 {

 DevApp/Gs.DevApp/Properties/Resources.resx

@@ -121,6 +121,11 @@
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -134,6 +139,11 @@
  </data>
  <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -161,11 +171,6 @@
  </data>
  <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -197,11 +202,6 @@
            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="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>
@@ -225,6 +225,9 @@
    <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
@@ -285,6 +288,11 @@
  </data>
  <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -518,9 +526,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -531,8 +536,8 @@
            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,
  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -687,11 +692,6 @@
            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,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -699,16 +699,16 @@
  <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>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
  <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_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="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -728,13 +728,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -762,8 +762,8 @@
  <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
  <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -775,4 +775,7 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
</root>

 DevApp/Gs.DevApp/Resources/open2.svg

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Open2" style="enable-background:new 0 0 32 32">
  <style type="text/css">
    .Green{fill:#039C23;}
    .Yellow{fill:#FFB115;}
    .st0{opacity:0.75;}
</style>
  <g class="st0">
    <path d="M19.2,10H12V7c0-0.6-0.4-1-1-1H3C2.4,6,2,6.5,2,7v18c0,0.2,0,0.3,0.1,0.4c0,0,0.1-0.1,0.1-0.2l5.5-10   C8,14.5,8.7,14,9.5,14h13.7L19.2,10z" class="Yellow" />
  </g>
  <path d="M29.3,16H9.6L4,26h19.8c0.5,0,1.1-0.2,1.3-0.6l4.9-8.9C30.1,16.2,29.8,16,29.3,16z" class="Yellow" />
  <path d="M28,8c0-3.3-2.7-6-6-6s-6,2.7-6,6c0-2.2,1.8-4,4-4s4,1.8,4,4h-4l6,6l6-6H28z" class="Green" />
</svg>

 DevApp/Gs.DevApp/TestForm/XtraForm3.Designer.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/TestForm/XtraForm3.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/TestForm/XtraForm3.resx

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs

@@ -69,6 +69,7 @@
            this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            this.barLargeButtonItem1 = new DevExpress.XtraBars.BarLargeButtonItem();
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
            this.SuspendLayout();
            // 
@@ -113,9 +114,10 @@
            this.btnDkg,
            this.btnZanTing,
            this.btnBdll,
            this.btnWg});
            this.btnWg,
            this.barLargeButtonItem1});
            this.barManager1.MainMenu = this.bar2;
            this.barManager1.MaxItemId = 47;
            this.barManager1.MaxItemId = 48;
            // 
            // bar2
            // 
@@ -432,7 +434,7 @@
            this.btnKg.Caption = "开工";
            this.btnKg.Id = 42;
            this.btnKg.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
            this.btnKg.ImageOptions.ImageUri.Uri = "business%20objects/bo_security_permission_navigate";
            this.btnKg.ImageOptions.ImageUri.Uri = "Open";
            this.btnKg.Name = "btnKg";
            this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            this.btnKg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -442,6 +444,7 @@
            this.btnDkg.Caption = "待开工";
            this.btnDkg.Id = 43;
            this.btnDkg.ImageOptions.ImageUri.Uri = "NavigationBar";
            this.btnDkg.ImageOptions.SvgImage = global::Gs.DevApp.Properties.Resources.open2;
            this.btnDkg.Name = "btnDkg";
            this.btnDkg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            this.btnDkg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -450,7 +453,7 @@
            // 
            this.btnZanTing.Caption = "工单暂停";
            this.btnZanTing.Id = 44;
            this.btnZanTing.ImageOptions.ImageUri.Uri = "business%20objects/bo_rules";
            this.btnZanTing.ImageOptions.ImageUri.Uri = "Up";
            this.btnZanTing.Name = "btnZanTing";
            this.btnZanTing.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            this.btnZanTing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -470,6 +473,7 @@
            this.btnWg.Id = 46;
            this.btnWg.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnWg.ImageOptions.SvgImage")));
            this.btnWg.Name = "btnWg";
            this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barDockControlTop
            // 
@@ -483,7 +487,7 @@
            // 
            this.barDockControlBottom.CausesValidation = false;
            this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 285);
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 75);
            this.barDockControlBottom.Manager = this.barManager1;
            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
            // 
@@ -493,7 +497,7 @@
            this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
            this.barDockControlLeft.Location = new System.Drawing.Point(0, 145);
            this.barDockControlLeft.Manager = this.barManager1;
            this.barDockControlLeft.Size = new System.Drawing.Size(0, 140);
            this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
            // 
            // barDockControlRight
            // 
@@ -501,7 +505,13 @@
            this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
            this.barDockControlRight.Location = new System.Drawing.Point(1543, 145);
            this.barDockControlRight.Manager = this.barManager1;
            this.barDockControlRight.Size = new System.Drawing.Size(0, 140);
            this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
            // 
            // barLargeButtonItem1
            // 
            this.barLargeButtonItem1.Caption = "barLargeButtonItem1";
            this.barLargeButtonItem1.Id = 47;
            this.barLargeButtonItem1.Name = "barLargeButtonItem1";
            // 
            // UcToolBarMenu
            // 
@@ -512,7 +522,7 @@
            this.Controls.Add(this.barDockControlBottom);
            this.Controls.Add(this.barDockControlTop);
            this.Name = "UcToolBarMenu";
            this.Size = new System.Drawing.Size(1543, 285);
            this.Size = new System.Drawing.Size(1543, 75);
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();
@@ -558,5 +568,6 @@
        private DevExpress.XtraBars.BarLargeButtonItem btnZanTing;
        private DevExpress.XtraBars.BarLargeButtonItem btnBdll;
        private DevExpress.XtraBars.BarLargeButtonItem btnWg;
        private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem1;
    }
}

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -45,6 +45,14 @@
            btnBoHui.ItemClick += BtnBoHui_ItemClick;
            btnJieAn.ItemClick += BtnJieAn_ItemClick;
            btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
            btnTzbl.ItemClick += BtnTzbl_ItemClick;
            btnKg.ItemClick += BtnKg_ItemClick;
            btnDkg.ItemClick += BtnDkg_ItemClick;
            btnZanTing.ItemClick += BtnZanTing_ItemClick;
            btnBdll.ItemClick += BtnBdll_ItemClick;
            btnWg.ItemClick += BtnWg_ItemClick;


            var lst = new List<string>();
            foreach (BarItem item in barManager1.Items)
                if (item is BarLargeButtonItem largeButtonItem)
@@ -53,7 +61,7 @@
            actions = lst;
        }


      
        /// <summary>
        ///     åˆå§‹åŒ–按钮状态
        /// </summary>
@@ -179,7 +187,8 @@
                //  MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            else {
            else
            {
                if (string.IsNullOrEmpty(chkParameter))
                {
                    MsgHelper.ShowError("没有指定审核参数，请联系开发人员获取支持！");
@@ -534,6 +543,37 @@
            if (btnRoleClick != null) btnRoleClick(this, e);
        }

        private void BtnWg_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnWgClick != null) btnWgClick(this, e);
        }

        private void BtnBdll_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnBdllClick != null) btnBdllClick(this, e);
        }

        private void BtnZanTing_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnZanTingClick != null) btnZanTingClick(this, e);
        }

        private void BtnDkg_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnBtnDkgClick != null) btnBtnDkgClick(this, e);
        }

        private void BtnKg_ItemClick(object sender, ItemClickEventArgs e)
        {
            
            if (btnKgClick != null) btnKgClick(this, e);
        }

        private void BtnTzbl_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnTzblClick != null) btnTzblClick(this, e);
        }

        private void _enabledBtn(List<string> lstBtn)
        {
            foreach (BarItem item in barManager1.Items)
@@ -704,7 +744,6 @@
                MsgHelper.Warning("提示：" + ex.Message);
                return true;
            }

            return false;
        }

@@ -757,10 +796,6 @@
        /// </summary>
        public event EventHandler btnEscClick;

        /// <summary>
        ///     å¼€å·¥
        /// </summary>
        public event EventHandler btnKGClick;

        /// <summary>
        ///     æƒé™
@@ -851,6 +886,37 @@
        /// åç»“案
        /// </summary>
        public event EventHandler btnFjieAnClick;


        /// <summary>
        ///     å¼€å·¥
        /// </summary>
        public event EventHandler btnKgClick;

        /// <summary>
        /// é€šçŸ¥å¤‡æ–™
        /// </summary>
        public event EventHandler btnTzblClick;

        /// <summary>
        /// å¾…开工
        /// </summary>
        public event EventHandler btnBtnDkgClick;

        /// <summary>
        /// å·¥å•æš‚停
        /// </summary>
        public event EventHandler btnZanTingClick;

        /// <summary>
        /// å¤‡å•é¢†æ–™
        /// </summary>
        public event EventHandler btnBdllClick;

        /// <summary>
        /// æ‰‹åŠ¨å®Œå·¥
        /// </summary>
        public event EventHandler btnWgClick;
        #endregion

        #region å…¬å…±å±žæ€§

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx

@@ -316,22 +316,27 @@
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi4z
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIIDAAAC77u/
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIIEAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
        MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
        bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iVGFzayI+DQogICAgPHBhdGggZD0i
        TTI3LDJoLTN2MjRIOFYySDVDNC40LDIsNCwyLjQsNCwzdjI2YzAsMC42LDAuNCwxLDEsMWgyMmMwLjYs
        MCwxLTAuNCwxLTFWM0MyOCwyLjQsMjcuNiwyLDI3LDJ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDxw
        YXRoIGQ9Ik0yMCwyVjFjMC0wLjYtMC40LTEtMS0xaC02Yy0wLjYsMC0xLDAuNC0xLDF2MWgtMnY0aDEy
        VjJIMjB6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBhdGggZD0iTTIyLDEwbC04LDhsLTQtNHY0YzEu
        NywxLjgsNCw0LDQsNGw4LThWMTB6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJTZWN1cml0eV94NUZf
        UGVybWlzc2lvbl94NUZfTW9kZWwiPg0KICAgIDxwYXRoIGQ9Ik0yNCwxNGMtNC40LDAtOCwzLjYtOCw4
        czMuNiw4LDgsOHM4LTMuNiw4LThTMjguNCwxNCwyNCwxNHogTTIyLjUsMjZMMTksMjIuNWwxLjUtMS41
        bDIsMmw1LTVsMS41LDEuNSAgIEwyMi41LDI2eiIgY2xhc3M9IkdyZWVuIiAvPg0KICAgIDxyZWN0IHg9
        IjQiIHk9IjE0IiB3aWR0aD0iMTAiIGhlaWdodD0iMTAiIGNsYXNzPSJCbHVlIiAvPg0KICAgIDxyZWN0
        IHg9IjQiIHk9IjIiIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCIgY2xhc3M9IlJlZCIgLz4NCiAgICA8cmVj
        dCB4PSIxNiIgeT0iMiIgd2lkdGg9IjEwIiBoZWlnaHQ9IjEwIiBjbGFzcz0iWWVsbG93IiAvPg0KICA8
        L2c+DQo8L3N2Zz4L
</value>
  </data>
</root>