From ecc7e3a6402157c73f220aede085fbb87251c493 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 10 七月 2024 09:55:38 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs | 69 ++++++++++++----------------------
1 files changed, 25 insertions(+), 44 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index f8657c3..9089659 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -1010,7 +1010,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("YF_PayMentBill/Cg_POOrderReceiveSumReport")]
+ [Route("YF_PayMentBill/POOrderReceiveSumReport")]
[HttpGet]
public object POOrderReceiveSumReport(string sWhere, string user)
{
@@ -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)
@@ -1051,33 +1051,34 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Cg_POInStockBillSumReport/list")]
+ [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
{
List<object> columnNameList = new List<object>();
////鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillSumReport_Query", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillSumReport_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//鏌ヨ
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");
}
//娣诲姞鍒楀悕
@@ -1107,26 +1108,16 @@
#endregion
#region 閲囪喘涓氬姟/璁㈠崟鎶ョ粺璁¤〃 鏌ヨ
- [Route("Sup_QuotePriceBill/Cg_POOrderBillSumReport")]
+ [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)
@@ -1155,26 +1146,16 @@
#endregion
#region 閲囪喘浠锋牸鍒嗘瀽琛� 鏌ヨ
- [Route("Sup_QuotePriceBill/POMaterialPriceReport ")]
+ [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)
@@ -1208,7 +1189,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Cg_POOrderBillSumReport/Cg_POOrderBillProcessSumReport")]
+ [Route("YF_PayMentBill/Cg_POOrderBillProcessSumReport")]
[HttpGet]
public object Cg_POOrderBillProcessSumReport(string sWhere, string user)
{
@@ -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)
@@ -1250,7 +1231,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Cg_POInStockBillSumReport/Cg_POOrderReceiveDaySumReport")]
+ [Route("YF_PayMentBill/Cg_POOrderReceiveDaySumReport")]
[HttpGet]
public object Cg_POOrderReceiveDaySumReport(string sWhere, string user)
{
@@ -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