From 951587f554b2daabb19f969d17811b7bfedf6b44 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 18 六月 2024 15:32:01 +0800
Subject: [PATCH] 新增设备工艺参数订单点检表相关调用方法等
---
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index 3a0a82b..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)
@@ -1053,7 +1053,7 @@
/// </summary>
[Route("YF_PayMentBill/GetCg_POInStockBillSumReport")]
[HttpGet]
- public object GetCg_POInStockBillSumReport(string sWhere, string user, string userid)
+ public object GetCg_POInStockBillSumReport(string sWhere, string user)
{
try
{
@@ -1072,12 +1072,13 @@
//鏌ヨ
if (sWhere == null || sWhere.Equals(""))
{
- string sql = "exec h_p_Cg_POInStockBillSumReport '','" + userid + "'";
+ string sql = "exec h_p_Cg_POInStockBillSumReport ''";
ds = oCN.RunProcReturn(sql, "h_p_Cg_POInStockBillSumReport");
}
else
{
- string sql = "exec h_p_Cg_POInStockBillSumReport '" + sWhere + "','" + userid + "'";
+ string sql = "exec h_p_Cg_POInStockBillSumReport '" + sWhere + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Cg_POInStockBillSumReport");
}
//娣诲姞鍒楀悕
@@ -1109,24 +1110,14 @@
#region 閲囪喘涓氬姟/璁㈠崟鎶ョ粺璁¤〃 鏌ヨ
[Route("YF_PayMentBill/Cg_POOrderBillSumReport")]
[HttpGet]
- public object Cg_POOrderBillSumReport(string DateYear, string HType, string user)
+ public object Cg_POOrderBillSumReport(string sWhere, string user)
{
try
{
DataSet ds;
List<object> columnNameList = new List<object>();
- if (DateYear == null || DateYear.Equals(""))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤";
- return objJsonResult;
- }
- else
- {
- ds = oCN.RunProcReturn("exec [h_p_Cg_POOrderBillSumReport] '" + DateYear + "','" + HType + "'", "[h_p_Cg_POMaterialPriceReport]");
- }
+ ds = oCN.RunProcReturn("exec [h_p_Cg_POOrderBillSumReport] '" + sWhere + "'", "[h_p_Cg_POMaterialPriceReport]");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1157,24 +1148,14 @@
#region 閲囪喘浠锋牸鍒嗘瀽琛� 鏌ヨ
[Route("YF_PayMentBill/POMaterialPriceReport")]
[HttpGet]
- public object POMaterialPriceReport(string DateYear, string HType, string user)
+ public object POMaterialPriceReport(string sWhere, string user)
{
try
{
DataSet ds;
List<object> columnNameList = new List<object>();
- if (DateYear == null || DateYear.Equals(""))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤";
- return objJsonResult;
- }
- else
- {
- ds = oCN.RunProcReturn("exec [h_p_Cg_POMaterialPriceReport] '" + DateYear + "','" + HType + "'", "[h_p_Cg_POMaterialPriceReport]");
- }
+ ds = oCN.RunProcReturn("exec [h_p_Cg_POMaterialPriceReport] '" + sWhere + "'", "[h_p_Cg_POMaterialPriceReport]");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1216,7 +1197,7 @@
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_Cg_POOrderBillProcessSumReport '" + sWhere + "','',''", "h_p_Cg_POOrderBillProcessSumReport");
+ ds = oCN.RunProcReturn("exec h_p_Cg_POOrderBillProcessSumReport '" + sWhere + "'", "h_p_Cg_POOrderBillProcessSumReport");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1258,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