1

wtt

48 分钟以前 d82756d630f5f9bcc588fee772b68bc2a7725cb0

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_CompleteController..cs

@@ -27,10 +27,20 @@
        /// <returns></returns>
        [Route("JIT_Complete/JIT_CompleteDetailList")]
        [HttpGet]
        public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID,string HMainICMOInterID,string HICMOInterID)
        public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID,string HMainICMOInterID,string HICMOInterID,string user)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("JIT_CompleteMaterlDetailList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "";
                if (HMainICMOEntryID != "-1" && HMainICMOInterID != "-1" && HICMOInterID != "-1")
                {
@@ -61,7 +71,6 @@
        /// 
        /// </summary>
        /// <param name="sWhere">查询条件</param>
        /// <param name="HMainICMOEntryID">生产订单明细表id</param>
        /// <returns></returns>
        [Route("JIT_Complete/JIT_CompleteMaterlDetailList")]
        [HttpGet]
@@ -180,25 +189,35 @@
        {
            public int? HORGID;//组织
            public int? HMATERIALID;//物料
            public int? HDeptID;//生产车间
            public string HDeptID;//生产车间
            public int? HSCZYID;//生产资源
            public string HXQD;//需求单号
            public string HMOBILLNO;//生产订单号
            public string HBeginDate; //排产计划日期（开始时间）
            public string HEndDate; //排产计划日期（结束时间）
            public string HMaterAtt; //物料属性
        }
        /// <summary>
        /// 
        /// é½å¥—分析报表
        /// </summary>
        /// <returns></returns>
        [Route("JIT_Complete/ReportMOMaterReadysBillList")]
        [HttpGet]
        public object ReportMOMaterReadysBillList(string sWhere)
        public object ReportMOMaterReadysBillList(string sWhere,string user)
        {
            try
            {

                if (!DBUtility.ClsPub.Security_Log("JIT_ReportMOMaterReadysBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ReportMOMaterReadysBill Report = JsonConvert.DeserializeObject<ReportMOMaterReadysBill>(sWhere);

                ds = oCN.RunProcReturn($"exec  PR_Complete_Report '{Report.HXQD}','{Report.HMOBILLNO}',{Report.HORGID},{Report.HDeptID},{Report.HSCZYID},{Report.HMATERIALID}", "PR_Complete_Report");
                ds = oCN.RunProcReturn($"exec  PR_Complete_Report '{Report.HXQD}','{Report.HMOBILLNO}',{Report.HORGID},'{Report.HDeptID}',{Report.HSCZYID},{Report.HMATERIALID},'{Report.HBeginDate}','{Report.HEndDate}','{Report.HMaterAtt}'", "PR_Complete_Report");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -216,5 +235,52 @@
            }
        }
        #endregion

        #region æ¬ æ–™æŠ¥è¡¨
        /// <summary>
        /// 
        /// </summary>
        /// <returns></returns>
        [Route("JIT_Complete/MaterialLevelShorReportList")]
        [HttpGet]
        public object MaterialLevelShorReportList(string sWhere,string HBEGINDATE,string HENDDATE,string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (!DBUtility.ClsPub.Security_Log("JIT_MaterialLevelShorAnalysisReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn($"exec  h_p_JIT_MaterialLevelShorReportList '{sWhere}','{HBEGINDATE}','{HENDDATE}'", "h_p_JIT_MaterialLevelShorReportList");
                //添加列名
                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 = e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}