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

wtt

2024-08-07 c2ef1e65edb97ddbd00cc130e9f4dd9d47e0252d

 WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs

@@ -978,5 +978,176 @@
            }
        }
        #endregion

        #region è´¨é‡æ¨¡å—   å¼‚常反馈分析报表  æŸ¥è¯¢

        [Route("QC_CustomerAppealReport/getOA_ErrMsgBackBillList_Query")]
        [HttpGet]
        public object getOA_ErrMsgBackBillList_Query(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_OA_ErrMsgBackBillList_Query order by æ—¥æœŸ desc", "h_v_OA_ErrMsgBackBillList_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_OA_ErrMsgBackBillList_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ ";
                    ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackBillList_Query");
                }

                //添加列名
                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

        #region è´¨é‡æ¨¡å— å¼‚常管理台账
        /// <summary>
        /// è¿”回异常管理台账
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("QC_CustomerAppealReport/QC_ErrManagerLedgerReport")]
        [HttpGet]
        public object QC_ErrManagerLedgerReport(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询条件！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);


                string HBeginDate = dic["HBeginDate"].ToString();
                string HEndDate = dic["HEndDate"].ToString();
                int HDeptID = int.Parse(dic["HDeptID"].ToString());
                string HMaterModel = dic["HMaterModel"].ToString();
                string HSourceName = dic["HSourceName"].ToString();
                string HProSource = dic["HProSource"].ToString();
                string HShiftsName = dic["HShiftsName"].ToString();
                string HCustomize = dic["HCustomize"].ToString();

                ds = oCN.RunProcReturn("exec h_p_QC_ErrManagerLedgerReport '" + HBeginDate + "','" + HEndDate + "'," + HDeptID + ",'" + HMaterModel + "','" + HSourceName + "','" + HProSource + "','" + HShiftsName + "','" + HCustomize + "'", "h_p_QC_ErrManagerLedgerReport");

                //添加列名
                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

        #region è´¨é‡æ¨¡å— ä¸è‰¯å“å°è´¦
        /// <summary>
        /// è¿”回异常管理台账
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("QC_CustomerAppealReport/QC_BadProductsReport")]
        [HttpGet]
        public object QC_BadProductsReport(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询条件！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);


                string HBeginDate = dic["HBeginDate"].ToString();
                string HEndDate = dic["HEndDate"].ToString();
                string HMaterNumber = dic["HMaterNumber"].ToString();
                string HMaterModel = dic["HMaterModel"].ToString();
                string HProcessName = dic["HProcessName"].ToString();
                string HDealingType = dic["HDealingType"].ToString();
                string HSendManName = dic["HSendManName"].ToString();
                string HCustomize = dic["HCustomize"].ToString();

                ds = oCN.RunProcReturn("exec h_p_QC_BadProductsReport '" + HBeginDate + "','" + HEndDate + "','" + HMaterNumber + "','" + HMaterModel + "','" + HProcessName + "','" + HDealingType + "','" + HSendManName + "','" + HCustomize + "'", "h_p_QC_BadProductsReport");

                //添加列名
                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

    }
}