From 9ce9ea28b20f48914cf7f0c3d0b61a4ba939f96a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 14 六月 2024 13:07:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index 4f973d0..9089659 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -1018,7 +1018,7 @@
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_Cg_POOrderReceiveSumReport '" + sWhere + "','',''", "h_p_Cg_POMaterialPriceReport");// h_p_Cg_POMaterialPriceReport 閲囪喘鍒嗘瀽鎶ヨ〃
+ ds = oCN.RunProcReturn("exec h_p_Cg_POOrderReceiveSumReport '" + sWhere + "'", "h_p_Cg_POOrderReceiveSumReport");// h_p_Cg_POMaterialPriceReport 閲囪喘鍒嗘瀽鎶ヨ〃
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1078,6 +1078,7 @@
else
{
string sql = "exec h_p_Cg_POInStockBillSumReport '" + sWhere + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Cg_POInStockBillSumReport");
}
//娣诲姞鍒楀悕
@@ -1238,7 +1239,7 @@
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_Cg_POOrderReceiveDaySumReport '" + sWhere + "',", "h_p_Cg_POOrderReceiveDaySumReport");
+ ds = oCN.RunProcReturn("exec h_p_Cg_POOrderReceiveDaySumReport '" + sWhere + "'", "h_p_Cg_POOrderReceiveDaySumReport");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1