From d74b85f0c08da89bf57c0de6eed3d74066dbd627 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 二月 2025 10:36:37 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/EntrustOrderController.cs |   49 +++++++++++++------------------------------------
 1 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/WebAPI/Controllers/EntrustOrderController.cs b/WebAPI/Controllers/EntrustOrderController.cs
index ab022cb..813b707 100644
--- a/WebAPI/Controllers/EntrustOrderController.cs
+++ b/WebAPI/Controllers/EntrustOrderController.cs
@@ -18,7 +18,7 @@
     {
         private JsonResult objJsonResult = new JsonResult();
         private json objjson = new json();
-        SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
 
         /// <summary>
         /// 閲囪喘鍗曞垪琛�
@@ -28,34 +28,22 @@
         /// <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();
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                 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;
-                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.Message = "杞崲鐗规畩瀛楃澶辫触";
                     objjson.data = null;
                     return objjson;
                 }
@@ -63,22 +51,11 @@
                 Int64 RowTotal = Common.GetRowTotal("H_v_SRM_EntrustOrderBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                 //鑾峰彇杩斿洖鏁版嵁
                 ds = oCn.RunProcReturn("exec H_p_SRM_EntrustOrderBillList '" + PcWhere + "'", "H_p_SRM_EntrustOrderBillList");
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objjson.code = "0";
-                    objjson.count = 0;
-                    objjson.Message = "鑾峰彇澶辫触";
-                    objjson.data = null;
-                    return objjson;
-                }
-                else
-                {
-                    objjson.code = "0";
-                    objjson.count = 10000;
-                    objjson.Message = "鑾峰彇鎴愬姛";
-                    objjson.data = ds.Tables[0];
-                    return objjson;
-                }
+                objjson.code = "0";
+                objjson.count = 10000;
+                objjson.Message = "鑾峰彇鎴愬姛";
+                objjson.data = ds.Tables[0];
+                return objjson;
             }
             catch (Exception e)
             {

--
Gitblit v1.9.1