From ab3ffc8f500e3ad83f7e60cfb6a8fc2eeca8c02f Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期三, 04 一月 2023 14:45:56 +0800 Subject: [PATCH] 11 --- WebAPI/Controllers/POOrderController.cs | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/WebAPI/Controllers/POOrderController.cs b/WebAPI/Controllers/POOrderController.cs index c524c2a..e8f676e 100644 --- a/WebAPI/Controllers/POOrderController.cs +++ b/WebAPI/Controllers/POOrderController.cs @@ -1,4 +1,5 @@ 锘縰sing DBUtility; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using SQLHelper; using System; @@ -28,50 +29,50 @@ /// <param name="OnePage"></param> /// <returns></returns> [Route("GetPOOrderBill")] - [HttpGet] + [HttpPost] //閲囪喘璁㈠崟鍒楄〃 - public object GetPOOrderBill(string HSupNo, string sqlWhere) + public object GetPOOrderBill([FromBody] JObject msg) { - string msg = ""; + string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString(); + //string msg = ""; 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 += " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere; - //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() + "^^)"; - } + string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere; //杞崲鐗规畩瀛楃 - if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false) + if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false) { objjson.code = "0"; objjson.count = 0; - objjson.Message = "鑾峰彇澶辫触"; + objjson.Message = "杞崲鐗规畩瀛楃澶辫触"; objjson.data = null; return objjson; } //鑾峰彇鎬昏鏁� //Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POOrderBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo); //鑾峰彇杩斿洖鏁版嵁 - string sql = "exec H_p_SRM_POOrderBillList '" + PcWhere + "'"; + //sql = "exec H_P_REALESEPOORDER"; + //sql = "exec H_P_REALESEPOORDER"; + //oCn.RunProc(sql); + sql = "exec H_p_SRM_POOrderBillList '" + PcWhere + "'"; //LogService.WriteAsync(sql); - ds = oCn.RunProcReturn("exec H_p_SRM_POOrderBillList '" + PcWhere + "'", "H_p_SRM_POOrderBillList"); - + //娣诲姞鍒楀悕 + List<object> columnNameList = new List<object>(); + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } objjson.code = "0"; objjson.count = 10000; objjson.Message = "鑾峰彇鎴愬姛"; objjson.data = ds.Tables[0]; + objjson.list = columnNameList; return objjson; } @@ -186,9 +187,6 @@ return objjson; } } - - - [Route("POOrderAccept")] [HttpGet] /// <summary> -- Gitblit v1.9.1