网页版 采购订单列表 收料通知单列表 ，退料通知单列表，采购入库单列表：增加 审核 反审核 关闭 反关闭 作废 反作废 以及 自定义过滤 功能；

cwjbxqmz

2023-10-13 3578620d0066a447ecef69b17f61952a4f72756a

 WebAPI/Controllers/MateOutController.cs

@@ -1797,6 +1797,12 @@
                    case "Kf_ShrinkBrushTeReport":
                        ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushTeReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushTeReport");
                        break;
                    case "Kf_EmbossingOutReport":
                        ds = oCN.RunProcReturn($"select * from h_v_Kf_EmbossingOutReport where 1=1 " + sWhere, "h_v_Kf_EmbossingOutReport");
                        break;
                    case "Kf_StereoscopicFlowerOutReport":
                        ds = oCN.RunProcReturn($"select * from h_v_Kf_StereoscopicFlowerOutReport where 1=1 " + sWhere, "h_v_Kf_StereoscopicFlowerOutReport");
                        break;
                }


@@ -1828,17 +1834,66 @@
        }
        #endregion

        #region 领料统计报表
        /// <summary>
        /// 领料统计报表
        /// </summary>
        /// <returns></returns>
        [Route("MateOutController/GetKf_MateOutSumReport_QiaoYi_Json")]
        [HttpGet]
        public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere)
        {
            try
            {
                ds = oCN.RunProcReturn("exec h_p_Kf_MateOutSumReport_QiaoYi " + sWhere, "h_p_Kf_MateOutSumReport_QiaoYi");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "当前所输入过滤条件，没有返回任何结果！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    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


        #endregion

        #region  (生产订单维度)客户订单报表
        [Route("MaterOutEntryReport/sc_ICOMReportList")]
        [HttpGet]
        public object sc_ICOMReportList(string sWhere)
        public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate)
        {
            try
            {
                string sql = "exec h_p_sc_ICOMReport '"+ sWhere + "'";
                string sql = "exec h_p_sc_ICOMReport '"+ sWhere + "','"+ HBeginDate + "','"+ HEndDate + "'";

                ds = oCN.RunProcReturn(sql, "h_p_sc_ICOMReport");

@@ -1954,6 +2009,47 @@
        }
        #endregion

        #region  生产入库报表
        [Route("MaterOutEntryReport/sc_ICOMRKBanReport")]
        [HttpGet]
        public object sc_ICOMRKBanReport(string sWhere)
        {
            try
            {
                string sql = "select * from  h_v_sc_ICOMRKBanReport where 1=1  " + sWhere + " order by 日期 ";

                ds = oCN.RunProcReturn(sql, "h_v_sc_ICOMRKBanReport");

                DataTable dt = ds.Tables[0];

                //获取列名
                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 = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = dt;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  生产日记报表
        public class DayRkReport { 
        public string HBeginDate { get; set; }
@@ -2025,6 +2121,78 @@
        }
        #endregion

        #region  半成品报表
        public class SemiFinishedProductsReport
        {
            public string HBeginDate { get; set; }
            public string HEndDate { get; set; }
            public string HMaterNumber { get; set; }
            public string HCustomerName { get; set; }
            public string HProductName { get; set; }
        }
        [Route("MaterOutEntryReport/SemiFinishedProductsReportList")]
        [HttpGet]
        public object SemiFinishedProductsReportList(string sWhere, int num)
        {
            try
            {
                SemiFinishedProductsReport DayRkReportList = JsonConvert.DeserializeObject<SemiFinishedProductsReport>(sWhere);

                string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
                    $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'";
                ds = oCN.RunProcReturn(sql, "h_p_Gy_DayRkReport");

                DataTable dt = null;
                if (num == 1)
                {
                    dt = ds.Tables[0];
                }
                else if (num == 2)
                {
                    dt = ds.Tables[1];
                }

                //获取列名
                List<object> columnNameList = new List<object>();
                if (num == 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列对象的列名
                    }
                }
                else if (num == 2)
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[1].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.list = columnNameList;
                objJsonResult.data = dt;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  产线查询
        [Route("MaterOutEntryReport/Gy_SourceList")]
        [HttpGet]