Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

4 天以前 b7d9f2e23cbda587d814c7d07c1664c053c83dcb

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -62,13 +62,17 @@
        /// <returns></returns>
        public static string HttpPost(string url, string meth, string param, bool isLoading = true)
        {
            Size _size; string _caption; Color _color; Padding _pad;
            (_size, _caption, _color, _pad) = getLoading();
            DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("加载进度:" + meth, _caption, _size);
            wdf.BackColor = _color;
            wdf.Padding = _pad;
            wdf.SetCaption("加载进度:" + meth);
            wdf.Visible = isLoading;
            DevExpress.Utils.WaitDialogForm wdf = null;
            if (isLoading == true)
            {
                Size _size; string _caption; Color _color; Padding _pad;
                (_size, _caption, _color, _pad) = getLoading();
                wdf = new DevExpress.Utils.WaitDialogForm("加载进度:" + meth, _caption, _size);
                wdf.BackColor = _color;
                wdf.Padding = _pad;
                wdf.SetCaption("加载进度:" + meth);
                wdf.Visible = isLoading;
            }
            HttpWebRequest request = null;
            StreamWriter requestStream = null;
            WebResponse response = null;
@@ -103,7 +107,8 @@
            }
            catch (Exception ex)
            {
                wdf.Close();
                if (wdf != null)
                    wdf.Close();
                LogHelper.Debug(url, param + ":" + ex.Message);
                throw ex;
            }
@@ -113,7 +118,8 @@
                requestStream = null;
                response = null;
            }
            wdf.Close();
            if (wdf != null)
                wdf.Close();
            return responseStr;
        }

@@ -268,7 +274,8 @@
                        {
                            colmn.Visible = true;
                            colmn.OptionsColumn.ReadOnly = false;
                        };
                        }
                        ;
                        if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
                        {
                            colmn.Visible = !isEdt;
@@ -458,7 +465,7 @@
                        {
                            var txt = colType as RadioGroup;
                            if (txt != null)
                                txt.SelectedIndex =int.Parse( strVal);
                                txt.SelectedIndex = int.Parse(strVal);
                            txt.ReadOnly = isEdt;
                            continue;
                        }
@@ -1933,7 +1940,8 @@
                {
                    int _handle = gridView1.FocusedRowHandle;
                    bool _bl = xtraTabControl1.TabPages[0].PageEnabled;
                    if (_bl == false) { return; };
                    if (_bl == false) { return; }
                    ;
                    if (_handle < 0)
                    {
                        xtraTabControl1.SelectedTabPageIndex = -1;
@@ -2477,6 +2485,9 @@
        委外退料入库检,
        cqcjyes,//重检方案
        cqcjno,//重检方案
        产线称重,
        iqc称重,
        受托入库
    }