From b27cc0c7af4cb9f5b404c95f90c63be22668d0a6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 08 十月 2022 08:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Kanban/Sc_QLKB.cs | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs
index 49a7f84..fd3c8ee 100644
--- a/Kanban/Sc_QLKB.cs
+++ b/Kanban/Sc_QLKB.cs
@@ -148,7 +148,7 @@
//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 = "";
@@ -156,7 +156,7 @@
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;
+ 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)
@@ -170,7 +170,7 @@
});
this.oSumGrid.BuildTotalCols(cols);
int frCol = 10;
- string s = "鏄�";
+ s = "鍚�";
Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
}
int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
@@ -182,7 +182,13 @@
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;
@@ -327,6 +333,17 @@
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("棰勮鐘舵�侊紙澶╋級");
//int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺");
--
Gitblit v1.9.1