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

cdk

4 天以前 b7d9f2e23cbda587d814c7d07c1664c053c83dcb

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -55,20 +55,24 @@
        /// <summary>
        /// http请求
        /// </summary>
        /// <param name="url"></param>
        /// <param name="meth"></param>
        /// <param name="param"></param>
        /// <param name="isLoading"></param>
        /// <param name="url">api根地址</param>
        /// <param name="meth">方法名称</param>
        /// <param name="param">json参数</param>
        /// <param name="isLoading">是否loading</param>
        /// <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;
@@ -451,6 +458,15 @@
                                        break;
                                }
                            txt.Enabled = !isEdt;
                            continue;
                        }
                        //多选
                        if (colType is RadioGroup)
                        {
                            var txt = colType as RadioGroup;
                            if (txt != null)
                                txt.SelectedIndex = int.Parse(strVal);
                            txt.ReadOnly = isEdt;
                            continue;
                        }
                        //时间
@@ -747,6 +763,15 @@
                        txt.ReadOnly = isEdt;
                    continue;
                }
                //多选
                if (ctrl is RadioGroup)
                {
                    var txt = ctrl as RadioGroup;
                    if (txt != null)
                        txt.SelectedIndex = 0;
                    txt.ReadOnly = isEdt;
                    continue;
                }
                //时间
                if (ctrl is DateTimePicker)
                {
@@ -1004,6 +1029,13 @@
                if (ctrl is NumericUpDown)
                {
                    var txt = ctrl as NumericUpDown;
                    txt.ReadOnly = isEdt;
                    continue;
                }
                //多选
                if (ctrl is RadioGroup)
                {
                    var txt = ctrl as RadioGroup;
                    txt.ReadOnly = isEdt;
                    continue;
                }
@@ -1708,7 +1740,6 @@
                }
            };
            gridView1.OptionsView.ColumnAutoWidth = false;//自动调整列宽

            if (isPostSearch == true)
            {
                gridView1.OptionsView.ShowGroupPanel = false;
@@ -1725,7 +1756,6 @@
                //是否显示底部的过滤条
                // gridView1.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.Never;
            }

            // gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
            foreach (GridColumn column in gridView1.Columns)
            {
@@ -1751,7 +1781,6 @@
                        column.OptionsFilter.AllowAutoFilter = false;
                }
            }

            gridView1.IndicatorWidth = 60;
            gridView1.CustomDrawRowIndicator += (s, e) =>
            {
@@ -1911,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;
@@ -2174,8 +2204,6 @@
                txt_iCount_1.ReadOnly = true;
        }



        #region 自定义进度条列

        /// <summary>
@@ -2270,7 +2298,6 @@
        // private GridColumn checkBoxColumn = null;
        public static void CustomDrawColumnHeader(object sender, ColumnHeaderCustomDrawEventArgs e)
        {

            Rectangle checkBoxColumnHeaderRect = new Rectangle(51, 1, 37, 57);
            if (e.Column != null && e.Column.AbsoluteIndex == 0)
            {
@@ -2314,10 +2341,26 @@
                    else
                    {
                        checkBoxColumn.Tag = "1";
                        /********2025-07-23修补过滤bug 故注释 beg ************/
                        //foreach (DataRow row in _Table.Rows)
                        //{
                        //    row["chkInt"] = true;
                        //}
                        /********2025-07-23修补过滤bug 故注释 end ************/
                        /********2025-07-23修补过滤bug beg ************/
                        System.Collections.IList ftRow = gridView1.DataController.GetAllFilteredAndSortedRows();
                        System.Collections.ArrayList ftAry = new System.Collections.ArrayList();
                        foreach (System.Data.DataRowView _ft in ftRow)
                        {
                            string guid = _ft["guid"].ToString();
                            ftAry.Add(guid);
                        }
                        foreach (DataRow row in _Table.Rows)
                        {
                            row["chkInt"] = true;
                            if (ftAry.Contains(row["guid"].ToString()))
                                row["chkInt"] = true;
                        }
                        /********2025-07-23修补过滤bug end ************/
                    }
                    gcMain.BindingContext = new BindingContext();
                    gcMain.DataSource = _Table;
@@ -2330,7 +2373,6 @@
            }
        }
        #endregion


        //读取默认组织
        public static string GetFirstOrg(UserControl.UcLookOrg txt_erpSczz)
@@ -2440,8 +2482,12 @@
        其它入库检,
        销售退货入库检,
        超期检,
        委外退料入库检,
        cqcjyes,//重检方案
        cqcjno,//重检方案
        产线称重,
        iqc称重,
        受托入库
    }