From 4286ee5823987af404e167a7c4aeacbe7def3c36 Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期三, 27 七月 2022 10:19:37 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API into master --- Kanban/Sc_QLKB.cs | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs index e41c9fd..49a7f84 100644 --- a/Kanban/Sc_QLKB.cs +++ b/Kanban/Sc_QLKB.cs @@ -144,12 +144,20 @@ ////} //// /// - ClsCN clsCN = new ClsCN(); - ClsIni clsIni = new ClsIni(); - string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp.ini"); - this.sDeptID = text; + //ClsCN clsCN = new ClsCN(); + //ClsIni clsIni = new ClsIni(); + //string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp_SY.ini"); + //this.sDeptID = text; + + + ClsCN SubCn = new ClsCN(); + string sSql = ""; + string sWhere = ""; + ClsIni oIni = new ClsIni(); + string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini"); + sDeptID = sID; string procName = "exec h_p_QLKB " + this.sDeptID; - this.DSet = clsCN.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo); + this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo); bool flag = this.DSet == null; if (!flag) { @@ -164,6 +172,15 @@ int frCol = 10; string s = "鏄�"; Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol); + } + 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; + } } } catch (Exception e) @@ -300,8 +317,16 @@ grdMain.DataSource = null; grdMain.DataSource = DSet.Tables[0].DefaultView; - + 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; + } + } ////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊 //int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級"); //int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺"); @@ -465,6 +490,15 @@ HQty = 0; timer1.Enabled = true; } + 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; + } + } } private void toolStripButton1_Click(object sender, EventArgs e) -- Gitblit v1.9.1