From bcfd911073cddc18c64d3051decaf126561726b7 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期四, 14 十二月 2023 17:14:42 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 70 +++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs index a495249..01a3641 100644 --- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs +++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs @@ -863,5 +863,75 @@ } } #endregion + + #region 閿�鍞嚭搴� 鏉$爜鏄庣粏 + /// <summary> + /// </summary> + /// <param name="HInterID">鍗曟嵁ID</param> + /// <returns></returns> + [Route("Kf_SellOutBill/BarCodeNote")] + [HttpGet] + public object SellOutBill_BarCodeNote(int HInterID) + { + try + { + List<object> columnNameListSum = new List<object>(); + List<object> columnNameList0 = new List<object>(); + List<object> columnNameList1 = new List<object>(); + List<object> columnNameList2 = new List<object>(); + + string sql = "exec h_p_Kf_SellOutBillBarCodeNote " + HInterID; + ds = oCN.RunProcReturn(sql, "h_p_Kf_SellOutBillBarCodeNote"); + + //娣诲姞 鍩烘湰淇℃伅 鍒楀悕 + foreach (DataColumn col in ds.Tables[1].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + //娣诲姞 鐮佸崟淇℃伅 鍒楀悕 + foreach (DataColumn col in ds.Tables[2].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + //娣诲姞 鏉$爜鏄庣粏 鍒楀悕 + foreach (DataColumn col in ds.Tables[3].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + columnNameListSum.Add(columnNameList0); + columnNameListSum.Add(columnNameList1); + columnNameListSum.Add(columnNameList2); + + List<DataTable> tableList = new List<DataTable>(); + tableList.Add(ds.Tables[1]); + tableList.Add(ds.Tables[2]); + tableList.Add(ds.Tables[3]); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = tableList; + objJsonResult.list = columnNameListSum; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion } } \ No newline at end of file -- Gitblit v1.9.1