From 5fccb067ad7dc2dbcdacf8db642aa471488cd8f0 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期四, 20 二月 2025 15:24:29 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/CJGL/Sc_OEEReportController.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs b/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs index 9bcb6b8..fa6f551 100644 --- a/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs +++ b/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs @@ -177,5 +177,57 @@ } } #endregion + + + #region OEE鎶ヨ〃 鏌ヨ鏄庣粏(鐝) + /// <summary> + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Sc_OEEReport/getSc_OEEReportDetailist_WorkShift")] + [HttpGet] + public object getSc_OEEReportDetailist_WorkShift(string HSourceCode, string HDate, string HType, string user) + { + try + { + List<object> columnNameList = new List<object>(); + ////鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Sc_OEEReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + string sql = "exec h_p_SB_getLatestDataOfOEEDataDetailist_WorkShift '" + HSourceCode + "','" + HDate + "','" + HType + "'"; + ds = oCN.RunProcReturn(sql, "h_p_SB_getLatestDataOfOEEDataDetailist_WorkShift"); + + //娣诲姞鍒楀悕 + 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鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + 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