Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2022-07-25 061a166a87fd30ae6a4e61785e3c36a1c313f8a6

 WorkM/±¨±í·ÖÎö/Mes_OrderProcFlowAllReport.cs

@@ -255,24 +255,24 @@
                }
            }

            for (int j = HRecProc1Col; j < grdMain.Columns.Count-2; j++)
            {
                if (checkBox1.Checked == false)
                {
                    if (ClsPub.isStrNull(grdMain.Columns[j].HeaderText).ToUpper().Trim().Contains("不合格") == true)
                    {
                        grdMain.Columns[j].Visible = false;
                    }
                    else
                    {
                        grdMain.Columns[j].Visible = true;
                    }
                }
                else
                {
                    grdMain.Columns[j].Visible = true;
                }
            }
            //for (int j = HRecProc1Col; j < grdMain.Columns.Count-2; j++)
            //{
            //    if (checkBox1.Checked == false)
            //    {
            //        if (ClsPub.isStrNull(grdMain.Columns[j].HeaderText).ToUpper().Trim().Contains("不合格") == true)
            //        {
            //            grdMain.Columns[j].Visible = false;
            //        }
            //        else
            //        {
            //            grdMain.Columns[j].Visible = true;
            //        }
            //    }
            //    else
            //    {
            //        grdMain.Columns[j].Visible = true;
            //    }
            //}
            //
        }