From 62de1d98678b736d56ae929a5569f1c89b68cee0 Mon Sep 17 00:00:00 2001
From: lan <lan@DESKTOP-MG88OFJ>
Date: 星期六, 25 五月 2024 10:54:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/CGGL/YF_PayMentBillController.cs |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index f8657c3..3a0a82b 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)
         {
@@ -1051,7 +1051,7 @@
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
-        [Route("Cg_POInStockBillSumReport/list")]
+        [Route("YF_PayMentBill/GetCg_POInStockBillSumReport")]
         [HttpGet]
         public object GetCg_POInStockBillSumReport(string sWhere, string user, string userid)
         {
@@ -1059,14 +1059,14 @@
             {
                 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;
+                //}
 
 
                 //鏌ヨ
@@ -1107,7 +1107,7 @@
         #endregion
 
         #region 閲囪喘涓氬姟/璁㈠崟鎶ョ粺璁¤〃 鏌ヨ
-        [Route("Sup_QuotePriceBill/Cg_POOrderBillSumReport")]
+        [Route("YF_PayMentBill/Cg_POOrderBillSumReport")]
         [HttpGet]
         public object Cg_POOrderBillSumReport(string DateYear, string HType, string user)
         {
@@ -1155,7 +1155,7 @@
         #endregion
 
         #region 閲囪喘浠锋牸鍒嗘瀽琛�  鏌ヨ
-        [Route("Sup_QuotePriceBill/POMaterialPriceReport ")]
+        [Route("YF_PayMentBill/POMaterialPriceReport")]
         [HttpGet]
         public object POMaterialPriceReport(string DateYear, string HType, string user)
         {
@@ -1208,7 +1208,7 @@
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
-        [Route("Cg_POOrderBillSumReport/Cg_POOrderBillProcessSumReport")]
+        [Route("YF_PayMentBill/Cg_POOrderBillProcessSumReport")]
         [HttpGet]
         public object Cg_POOrderBillProcessSumReport(string sWhere, string user)
         {
@@ -1250,7 +1250,7 @@
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
-        [Route("Cg_POInStockBillSumReport/Cg_POOrderReceiveDaySumReport")]
+        [Route("YF_PayMentBill/Cg_POOrderReceiveDaySumReport")]
         [HttpGet]
         public object Cg_POOrderReceiveDaySumReport(string sWhere, string user)
         {

--
Gitblit v1.9.1