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

jhz

2022-08-09 9d93f219367a57659c6641319922dee224e68d39

 Kanban/Sc_CJKB.cs

@@ -101,15 +101,16 @@
                //-----------预警状态
                //开工时间小于当天时间，但是任务单状态还是 待生产，系统自动黄色警示；
                //完工时间小于当天时间，但是任务单还是待生产或者在执行的，系统自动红色警示；
                int HEDateCol = Fun_GetCol("计划完工日期");
                DateTime oNow = DateTime.Today.Date;
                for (int i = 0; i < grdMain.Rows.Count; i++)
                {
                    if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
                    {
                        grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
                    }
                }

                //int HEDateCol = Fun_GetCol("计划完工日期");
                //DateTime oNow = DateTime.Today.Date;
                //for (int i = 0; i < grdMain.Rows.Count; i++)
                //{
                //    if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
                //    {
                //        grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
                //    }
                //}

                //设置合计列
                string sTotalCol = "";