Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LW_MesClient

cnf

2 天以前 86e875b896d74dce8757ad693eb5dd336a7645cf

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -43,6 +43,20 @@
            ConfigurationManager.AppSettings["WebApiUrl"];

        /// <summary>
        /// 数据过滤
        /// </summary>
        /// <returns></returns>
        public static string GetOrgWhere()
        {
            System.Text.StringBuilder sb = new System.Text.StringBuilder();
            //sb.Append(" (select aboutGuid as fid from  SYS_USER_BIND where userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and ftype='组织')");
            //龙巍单组织直接过滤，并且单组织传入的‘1’与guid类型不符这里待修改
            sb.Append(" (select 1 as fid from  SYS_USER_BIND where userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and ftype='组织')");
            return sb.ToString();
        }


        /// <summary>
        /// 读取加载信息
        /// </summary>
        /// <returns></returns>
@@ -274,7 +288,7 @@
                        {
                            colmn.Visible = !isEdt;
                            if (colmn.Visible == true)
                                colmn.VisibleIndex = 99999;
                               colmn.VisibleIndex = 1;
                        }
                        else
                        {
@@ -1713,8 +1727,8 @@
        /// <param name="isPostSearch"></param>
        /// <param name="action2">委托2（列表显示明细）</param>
        public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isPostSearch = true, DelegateGetModel action2 = null)
        {
            gridView1.PopupMenuShowing += (s, e) =>
        { //2025-09-04 kyy 引入中文插件注
            /*gridView1.PopupMenuShowing += (s, e) =>
            {
                if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
                {
@@ -1732,7 +1746,7 @@
                        }
                    }
                }
            };
            };*/
            gridView1.OptionsView.ColumnAutoWidth = false;//自动调整列宽
            if (isPostSearch == true)
            {
@@ -1997,7 +2011,8 @@
        /// <param name="icoName"></param>
        public static void SetGridViewParameterMx(GridView gridView1, DevExpress.Utils.ToolTipController tips = null)
        {
            gridView1.PopupMenuShowing += (s, e) =>
            //2025-09-04 kyy 注
          /*  gridView1.PopupMenuShowing += (s, e) =>
            {
                if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
                {
@@ -2014,10 +2029,11 @@
                            }
                        }
                    }

                }
            };
            gridView1.OptionsView.ShowGroupPanel = false;
            gridView1.OptionsCustomization.AllowGroup = false;
            gridView1.OptionsCustomization.AllowGroup = false;*/

            // gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;
            foreach (GridColumn column in gridView1.Columns)
@@ -3364,11 +3380,24 @@
        ipqc首检,
        fqc,
        生产退料入库检,
        其它入库检
        其它入库检,
        销售退货入库检,
        超期检,
        委外退料入库检,
        cqcjyes,//重检方案
        cqcjno,//重检方案
        产线称重,
        iqc称重,
        受托入库
    }



    public enum OrderType
    {
        其它入库,
        物料调拨,
        其它出库
    }


}