From ffa387e35fb64107c944508c1131046d9e6b564d Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期二, 27 二月 2024 13:55:36 +0800 Subject: [PATCH] 凯贝奈特新增收料单单据类型 --- WebAPI/Controllers/POInStockBackController.cs | 86 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 68 insertions(+), 18 deletions(-) diff --git a/WebAPI/Controllers/POInStockBackController.cs b/WebAPI/Controllers/POInStockBackController.cs index a07c93a..8f3a9c2 100644 --- a/WebAPI/Controllers/POInStockBackController.cs +++ b/WebAPI/Controllers/POInStockBackController.cs @@ -1,4 +1,5 @@ 锘縰sing DBUtility; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using SQLHelper; using System; @@ -27,33 +28,20 @@ /// <param name="OnePage"></param> /// <returns></returns> [Route("GetPOInStockBackBillList")] - [HttpGet] - public object GetPOInStockBackBillList(string HSupNo, string sqlWhere) + [HttpPost] + public object GetPOInStockBackBillList([FromBody] JObject msg) { - string msg = ""; + string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString(); try { - if (msg == null) - { - msg = ""; - } string VsWhere = ""; string PcWhere = ""; SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM(); DataSet ds; //鍏朵粬杩囨护 - if (msg.Trim() == "") - { - msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=''" + 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 HItemID from h_v_IF_Supplier where hnumber=''" + 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) { return ""; } @@ -87,5 +75,67 @@ return objjson; } } + + + /// <summary> + /// 閫�璐у崟鍔ㄦ�佸垪琛� + /// </summary> + /// <param name="msg"></param> + /// <param name="NowPage"></param> + /// <param name="OnePage"></param> + /// <returns></returns> + [Route("GetPOInStockBackBill")] + [HttpPost] + //閫�璐у崟鍔ㄦ�佸垪琛� + public object GetPOInStockBackBill([FromBody] JObject 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; + 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.data = null; + return objjson; + } + + string sql2 = "select * from h_v_SRM_POInStockBackByK3List " + VsWhere; + + ds = oCn.RunProcReturn(sql2, "h_v_SRM_POInStockBackByK3List"); + //娣诲姞鍒楀悕 + 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; + + } + catch (Exception e) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + e.ToString(); + objjson.data = null; + return objjson; + } + + } } } \ No newline at end of file -- Gitblit v1.9.1