bug

lu

4 天以前 9702c6a4dc358c7bff2eb18c8426229a0140e34a

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -3,19 +3,22 @@
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
using DevExpress.XtraRichEdit.Model;
using DevExpress.XtraWaitForm;
using Gs.DevApp.DevFrm;
using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Windows.Forms;

@@ -40,6 +43,7 @@
            btnChk.ItemClick += BtnChk_ItemClick;
            btnFchk.ItemClick += BtnFchk_ItemClick;
            btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
            btnFPiZhun.ItemClick += BtnFPiZhun_ItemClick;
            btnLog.ItemClick += BtnLog_ItemClick;
            btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
            btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
@@ -57,6 +61,13 @@
            btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
            btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
            btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
            btnAll.ItemClick += BtnAll_ItemClick;
            btnGongZi.ItemClick += BtnGongZi_ItemClick;
            btnLianBan.ItemClick += BtnLianBan_ItemClick;
            btnGx.ItemClick += BtnGx_ItemClick;
            btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
            btnPingZhi.ItemClick += BtnPingZhi_ItemClick;
            btnFPingZhi.ItemClick += BtnFPingZhi_ItemClick;
            var lst = new List<string>();
            foreach (BarItem item in barManager1.Items)
                if (item is BarLargeButtonItem largeButtonItem)
@@ -64,6 +75,7 @@
                        lst.Add(item.Caption);
            actions = lst;
        }



        /// <summary>
@@ -74,7 +86,6 @@
            base.OnCreateControl();
            if (Parent != null) getNamespace();
        }

        private bool _isCk(int _type)
        {
            Form parentForm = this.FindForm();
@@ -110,13 +121,11 @@
            }
            return false;
        }
       
        private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnCaiGouFchkClick != null)
                btnCaiGouFchkClick(this, e);
        }

        private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnCaiGouChkClick != null)
@@ -146,9 +155,6 @@
                btnShouHouChkClick(this, e);
        }

      

       
        private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
        {
            bool bl = _isCk(0);
@@ -186,7 +192,6 @@
                return;
        }


        private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnLogClick != null) btnLogClick(this, e);
@@ -204,6 +209,10 @@
        private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnPiZhunClick != null) btnPiZhunClick(this, e);
        }
        private void BtnFPiZhun_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnFPiZhunClick != null) btnFPiZhunClick(this, e);
        }

        private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
@@ -229,9 +238,10 @@
                strType = xlsInService.Split('&')[1];
                strService = xlsInService.Split('&')[0];
            }
            else {
                 strType = "";
                 strService = xlsInService;
            else
            {
                strType = "";
                strService = xlsInService;
            }
            //这是一个随机值，将会被当作父亲guid存到file表中，服务端根据这个guid读取相应的文件
            string upGuid = Guid.NewGuid().ToString();
@@ -253,7 +263,7 @@
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            };
            frm.ShowDialog();
@@ -306,8 +316,8 @@

        private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnReportClick != null)
                btnReportClick(this, e);
            if (btnPrintClick != null)
                btnPrintClick(this, e);
            else
                return;

@@ -326,7 +336,6 @@
                frm.ShowDialog();
                return;
            }

            MsgHelper.ShowError("没有设计模板，请先设计模板！");
        }

@@ -361,6 +370,43 @@
            if (btnQueryClick != null) btnQueryClick(this, e);
        }

        private void BtnAll_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnAllClick != null)
                btnAllClick(this, e);
        }
        private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnLianBanClick != null)
                btnLianBanClick(this, e);
        }

        private void BtnGongZi_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnGongZiClick != null)
                btnGongZiClick(this, e);
        }
        private void BtnGx_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnGxClick != null)
                btnGxClick(this, e);
        }
        private void BtnBaoGao_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnBaoGaoClick != null)
                btnBaoGaoClick(this, e);
        }
        private void BtnFPingZhi_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnFPingZhiClick != null)
                btnFPingZhiClick(this, e);
        }
        private void BtnPingZhi_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnPingZhiClick != null)
                btnPingZhiClick(this, e);
        }

        /// <summary>
        /// 取消时，还原按钮可用性
        /// </summary>
@@ -384,6 +430,7 @@
                lst.Add(btnIn.Name);
                lst.Add(btnLog.Name);
                lst.Add(btnPiZhun.Name);
                lst.Add(btnFPiZhun.Name);
                lst.Add(btnHelp.Name);
                lst.Add(btnLayout.Name);
                lst.Add(btnFont.Name);
@@ -397,12 +444,18 @@
                lst.Add(btnCaiGouFchk.Name);
                lst.Add(btnShouHouChk.Name);
                lst.Add(btnShouHouFchk.Name);
                lst.Add(btnGongZi.Name);
                lst.Add(btnLianBan.Name);
                lst.Add(btnFPingZhi.Name);
                lst.Add(btnPingZhi.Name);
                // lst.Add(btnEsc.Name);
                lst.Add(btnGx.Name);
                lst.Add(btnBaoGao.Name);
                _enabledBtn(lst);
                this.currentAction = "esc";
                if (btnEscClick != null) btnEscClick(this, e);
            }
        }


        /// <summary>
        /// 保存成功后，还原按钮可用性
@@ -425,6 +478,7 @@
                    lst.Add(btnQuery.Name);
                    lst.Add(btnLog.Name);
                    lst.Add(btnPiZhun.Name);
                    lst.Add(btnFPiZhun.Name);
                    lst.Add(btnDesign.Name);
                    lst.Add(btnReport.Name);
                    lst.Add(btnKg.Name);
@@ -442,10 +496,17 @@
                    lst.Add(btnCaiGouFchk.Name);
                    lst.Add(btnShouHouChk.Name);
                    lst.Add(btnShouHouFchk.Name);
                    lst.Add(btnIn.Name);
                    lst.Add(btnOut.Name);
                    lst.Add(btnGongZi.Name);
                    lst.Add(btnLianBan.Name);
                    lst.Add(btnFPingZhi.Name);
                    lst.Add(btnPingZhi.Name);
                    // lst.Add(btnEsc.Name);
                    lst.Add(btnGx.Name);
                    lst.Add(btnBaoGao.Name);
                    _enabledBtn(lst);
                }


            }
        }

@@ -468,8 +529,8 @@
            lst.Add(btnHelp.Name);
            lst.Add(btnLayout.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnLog.Name);
            lst.Add(btnBaoGao.Name);
            _enabledBtn(lst);
            this.currentAction = "edit";
            if (btnEdtClick != null) btnEdtClick(this, e);
@@ -632,7 +693,6 @@
                    JsonConvert.SerializeObject(_obj));
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;

                if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("查询"))
                {
                    if (dt == null || dt.Rows.Count <= 0)
@@ -710,7 +770,6 @@
                    //        continue;
                    //    }
                    //}

                    //按钮是否在权限表中
                    var exists = dt.AsEnumerable().Any(row =>
                        row.Field<string>("name") == item.Caption);
@@ -724,7 +783,6 @@
                            _enabledList.Add(_btnName);
                    }
                }

                //默认启用的按钮
                _enabledList.Add(btnLoad.Name);
                _enabledList.Add(btnHelp.Name);
@@ -831,22 +889,15 @@
        /// </summary>
        public event EventHandler btnFChkClick;


        /// <summary>
        ///     检验
        /// </summary>
        public event EventHandler btnJianYanClick;

        /// <summary>
        ///     反检验
        /// </summary>
        public event EventHandler btnFjianYanClick;


        /// <summary>
        ///    批准
        /// </summary>
        public event EventHandler btnPiZhunClick;

        /// <summary>
        ///    批准
        /// </summary>
        public event EventHandler btnFPiZhunClick;


        /// <summary>
@@ -912,7 +963,7 @@
        /// <summary>
        /// 报表
        /// </summary>
        public event EventHandler btnReportClick;
        public event EventHandler btnPrintClick;

        /// <summary>
        /// 结案
@@ -961,6 +1012,42 @@
        /// </summary>
        public event EventHandler btnOutClick;

        /// <summary>
        /// 批量设置
        /// </summary>
        public event EventHandler btnAllClick;

        /// <summary>
        /// 连班设置
        /// </summary>
        public event EventHandler btnLianBanClick;


        /// <summary>
        /// 计算工资
        /// </summary>
        public event EventHandler btnGongZiClick;

        /// <summary>
        /// 工序变更
        /// </summary>
        public event EventHandler btnGxClick;

        /// <summary>
        /// 生成报告
        /// </summary>
        public event EventHandler btnBaoGaoClick;

        /// <summary>
        ///     品质
        /// </summary>
        public event EventHandler btnPingZhiClick;

        /// <summary>
        ///    反品质
        /// </summary>
        public event EventHandler btnFPingZhiClick;

        #endregion

        #region 公共属性
@@ -1006,6 +1093,47 @@
        #endregion


        /// <summary>
        /// 
        /// </summary>
        /// <param name="inType"></param>
        public void SetAllButton(int inType)
        {
            var lstBtn = new List<string>();
            if (inType == 0)
            {
                lstBtn.Add(btnSave.Name);
                lstBtn.Add(btnEsc.Name);
                foreach (BarItem item in barManager1.Items)
                    if (item is BarLargeButtonItem largeButtonItem)
                    {
                        if (!lstBtn.Contains(item.Name))
                            largeButtonItem.Enabled = true;
                        else
                            largeButtonItem.Enabled = false;
                    }
                return;
            }
            if (inType == 2)
            {
                lstBtn.Add(btnHelp.Name);
                lstBtn.Add(btnLoad.Name);
                lstBtn.Add(btnQuery.Name);
                lstBtn.Add(btnLayout.Name);
                lstBtn.Add(btnFont.Name);
                lstBtn.Add(btnAdd.Name);
                foreach (BarItem item in barManager1.Items)
                    if (item is BarLargeButtonItem largeButtonItem)
                    {
                        if (lstBtn.Contains(item.Name))
                            largeButtonItem.Enabled = true;
                        else
                            largeButtonItem.Enabled = false;
                    }
                return;
            }

        }

        /// <summary>
        /// 查找gridView
@@ -1104,7 +1232,6 @@
                parentForm = this.Parent as Form;
            else
                parentForm = this.Parent.Parent as Form;

            string _formNamespace = parentForm.GetType().FullName;
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = getGvList();
            List<DevExpress.XtraLayout.LayoutControl> layList = getLayList();
@@ -1215,5 +1342,6 @@
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }

    }
}