Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

2 天以前 2f695e7c0982d0de5c0cec5c16c5a3d574286773

 WebAPI/Controllers/»ªÔ¶datamapping/Gy_BarCodeReportController.cs

@@ -81,7 +81,7 @@
        #endregion


        #region ä¸è‰¯åŽŸå› æŸ¥è¯¢
        #region è¡¨æ ¼æŸ¥è¯¢
        [Route("Gy_BarCodeReportController/GetBadReason_proc")]
        [HttpGet]
        public object GetBadReason_proc(string sWhere, string user)
@@ -99,22 +99,32 @@

                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_QC_BarCodeBadReasonReport '" + HBeginDate + "','" + HEndDate + "','" + Station + "','" + MaterialNo + "','" + LotNo + "'", "h_p_QC_BarCodeBadReasonReport");
                ds = oCN.RunProcReturn("exec h_p_QC_BarCodeReasonTable '" + HBeginDate + "','" + HEndDate + "','"  + Station + "','" + MaterialNo + "','" + LotNo + "'", "h_p_QC_BarCodeReasonTable");

                //添加列名
                //if (ds == null || ds.Tables.Count == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "未查询到数据！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //添加列名1
                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));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables;
                objJsonResult.list = columnNameList;
                return objJsonResult;
                
              
                
            }
            catch (Exception e)
            {
@@ -127,7 +137,7 @@
        }
        #endregion

        #region ä¸è‰¯çŽ‡æŸ¥è¯¢
        #region æŸ±çŠ¶å›¾æŸ¥è¯¢
        [Route("Gy_BarCodeReportController/GetBadReasonTotal_proc")]
        [HttpGet]
        public object GetBadReasonTotal_proc(string sWhere, string user)
@@ -139,12 +149,13 @@

                string HBeginDate = dic["HBeginDate"].ToString();
                string HEndDate = dic["HEndDate"].ToString();
                string Station = dic["Station"].ToString();//站台
                string MaterialNo = dic["MaterialNo"].ToString();//料号
                string LotNo = dic["LotNo"].ToString();//批次号

                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_QC_BarCodeReasonTotalReport '" + HBeginDate + "','" + HEndDate + "','"  + "','" + MaterialNo + "','" + LotNo + "'", "h_p_QC_BarCodeBadReasonReport");
                ds = oCN.RunProcReturn("exec h_p_QC_BarCodeReasonTotalReport '" + HBeginDate + "','" + HEndDate + "','" +Station +  "','" + MaterialNo + "','" + LotNo + "'", "h_p_QC_BarCodeBadReasonReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -172,5 +183,52 @@
        }
        #endregion

        #region pie图
        [Route("Gy_BarCodeReportController/GetBadReason_pie")]
        [HttpGet]
        public object GetBadReason_pie(string sWhere, string user)
        {
            try
            {
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);


                string HBeginDate = dic["HBeginDate"].ToString();
                string HEndDate = dic["HEndDate"].ToString();
                string Station = dic["Station"].ToString();//站台
                string MaterialNo = dic["MaterialNo"].ToString();//料号
                string LotNo = dic["LotNo"].ToString();//批次号

                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_QC_BarCodeBadReasonReport_pie '" + HBeginDate + "','" + HEndDate + "','" + Station + "','" + MaterialNo + "','" + LotNo + "'", "h_p_QC_BarCodeBadReasonReport_pie");

                //添加列名
                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));//获取到DataColumn列对象的列名
                }

                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


    }
}