From f77e4196ad4870b713a0c51d874481a372c9201c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 09 十二月 2022 13:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/Sc_WorkShopReport.cs | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.cs"
index 2ddd55c..8d13608 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.cs"
@@ -166,8 +166,8 @@
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
}
- //
- DSet = SubCn.RunProcReturn("exec h_p_CJKB" + sDlgWhere, "Gy_Czygl");
+
+ DSet = SubCn.RunProcReturn("exec h_p_CJKB " + sDlgWhere, "h_p_CJKB");
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -176,33 +176,21 @@
}
//
grdMain.DataSource = DSet.Tables[0].DefaultView;
- //鑾峰彇鍔ㄦ�佸垪 锛堢墿鏂欎俊鎭級
- //DsHead = SubCn.RunProcReturn("exec h_p_Sc_GetProcExchReportHead " + sDlgWhere, "Gy_Czygl");
-
- //for (int a = 0; a < DsHead.Tables[0].Rows.Count; a++)
- //{
- // if (ClsPub.isLong(DsHead.Tables[0].Rows[a]["HMaterID"]) != 0)
- // {
- // grdMain.Columns.Add(ClsPub.isStrNull(DsHead.Tables[0].Rows[a]["HMaterID"]), ClsPub.isStrNull(DsHead.Tables[0].Rows[a]["HName"]));
- // grdMain.Columns[BCol].Tag = ClsPub.isLong(DsHead.Tables[0].Rows[a]["HMaterID"]);
- // BCol = BCol + 1;
- // }
- //}
BCol = 7;
//鑾峰彇鍔ㄦ�佸唴瀹� 锛堟暟閲忎俊鎭級
- for (int row = 0; row <= grdMain.RowCount - 1; row++)
- {
- for (int col = BCol; col <= grdMain.ColumnCount - 1; col++)
- {
- HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HDeptID")].Value);
- DsQty = SubCn.RunProcReturn("exec h_p_CJKB '" + HDeptID.ToString(), "Gy_Czygl");
- if (DsQty != null && DsQty.Tables[0].Rows.Count > 0)
- {
- grdMain.Rows[row].Cells[col].Value = DBUtility.ClsPub.isDoule(DsQty.Tables[0].Rows[0]["HQty"], 2);
- }
- }
- }
+ //for (int row = 0; row <= grdMain.RowCount - 1; row++)
+ //{
+ // for (int col = BCol; col <= grdMain.ColumnCount - 1; col++)
+ // {
+ // //HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HDeptID")].Value);
+ // DsQty = SubCn.RunProcReturn("exec h_p_CJKB " + 0, "h_p_CJKB");
+ // if (DsQty != null && DsQty.Tables[0].Rows.Count > 0)
+ // {
+ // grdMain.Rows[row].Cells[col].Value = DBUtility.ClsPub.isDoule(DsQty.Tables[0].Rows[0]["HQty"], 2);
+ // }
+ // }
+ //}
//璁剧疆鍚堣鍒�
string sTotalCol = "";
--
Gitblit v1.9.1