From 0c51493aa579b8e58863709b769c7b1d283d2165 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 02 十一月 2022 13:28:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI

---
 WebAPI/Controllers/EntrustOrderController.cs |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/WebAPI/Controllers/EntrustOrderController.cs b/WebAPI/Controllers/EntrustOrderController.cs
index 1b286f2..630e611 100644
--- a/WebAPI/Controllers/EntrustOrderController.cs
+++ b/WebAPI/Controllers/EntrustOrderController.cs
@@ -28,30 +28,18 @@
         /// <param name="OnePage"></param>
         /// <returns></returns>
         [Route("GetEntrustOrderBill")]
-        [HttpGet]
-        //閲囪喘璁㈠崟鍒楄〃
-        public object GetEntrustOrderBill(string HSupNo, string sqlWhere)
+        [HttpPost]
+        public object GetEntrustOrderBill([FromBody] JObject msg)
         {
-            string msg = "";
+            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
             try
             {
                 string VsWhere = "";
                 string PcWhere = "";
                 SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                 DataSet ds;
-                //鍏朵粬杩囨护
-                if (msg.Trim() == "")
-                {
-                    msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
-                    // msg = " Where   hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
-                }
-                else
-                {
-                    msg = msg + " and   hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
-                    // msg = msg + " Where   hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
-                }
-                //杞崲鐗规畩瀛楃
-                if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
+                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                 {
                     objjson.code = "0";
                     objjson.count = 0;

--
Gitblit v1.9.1