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

zrg

2024-08-28 293885f3dc033b8349b78e75954f665d44b84229

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

 DAL/Öʼì¹ÜÀí/ClsQC_PatrolProcCheckOtherBill.cs

@@ -90,7 +90,7 @@
                      ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
                      "," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
                      "'," + oSub.HUnitID + ",'" + oSub.HInspectValB + "','" + oSub.HInspectVal + "','" + oSub.HTargetValB + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + Convert.ToString(oSub.HKeyInspect ? 1 : 0) + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
                }



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

@@ -1518,6 +1518,47 @@

        #endregion

        #region è´¨é‡æ¨¡å— åˆ¶ç¨‹è´¨é‡é—¨é€ƒé€¸è¶‹åŠ¿å›¾æŠ¥è¡¨

        /// <summary>
        /// åˆ¶ç¨‹è´¨é‡é—¨é€ƒé€¸è¶‹åŠ¿å›¾æŠ¥è¡¨
        /// </summary>
        /// <returns></returns>
        [Route("QC_QualityReportsController/GetQC_QualityMonthSumReport_Json")]
        [HttpGet]
        public object GetQC_QualityMonthSumReport_Json(Int64 HYear, Int64 HDeptID)
        {
            try
            {
                ds = oCN.RunProcReturn("exec h_p_QC_QualityMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_QualityMonthSumReport");
                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));  //获取到DataColumn列对象的列名
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "返回报表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region è´¨é‡æ¨¡å— PPM绩效趋势图报表

        /// <summary>