From c78341d973da968d25a8185f646b624bd9a5e0d0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 01 九月 2022 15:07:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Kanban/Sc_QLKB.cs | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs
index e41c9fd..fd3c8ee 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;
- string procName = "exec h_p_QLKB " + this.sDeptID;
- this.DSet = clsCN.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
+ //ClsCN clsCN = new ClsCN();
+ //ClsIni clsIni = new ClsIni();
+ //string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp_SY.ini");
+ //this.sDeptID = text;
+ string s = "";
+
+ 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_CS " + this.sDeptID;
+ this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
bool flag = this.DSet == null;
if (!flag)
{
@@ -162,10 +170,25 @@
});
this.oSumGrid.BuildTotalCols(cols);
int frCol = 10;
- string s = "鏄�";
+ 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;
+ }
+ }
+ s = "鍚�";
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);
+ //Total();
+ }
catch (Exception e)
{
return;
@@ -300,7 +323,26 @@
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;
+ }
+ }
+
+
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = "鍚�";
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);
+
+
+
////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
//int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
@@ -465,6 +507,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