瑞琪工序出站汇报 批量 加 工序过滤

yangle

2023-09-22 04e3e27e535f68a44a90cb561a3e8c68861d2dc8

瑞琪工序出站汇报 批量 加 工序过滤

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -1424,12 +1424,12 @@
        //递入物料信息 返回未完全汇报的流转卡
        [Route("LEMS/Sc_StationOutBill_Mul_RYQ")]
        [HttpGet]
        public object Sc_StationOutBill_Mul_RYQ(String HMaterName, Int64 HOrgID)
        public object Sc_StationOutBill_Mul_RYQ(String HMaterName,string HProcNumber, Int64 HOrgID)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                DataSet ds = oCN.RunProcReturn("exec h_p_CJGXPLHB_Query '" + HMaterName + "'," + HOrgID + "", "h_p_CJGXPLHB_Query");
                DataSet ds = oCN.RunProcReturn("exec h_p_CJGXPLHB_Query '" + HMaterName + "'," + HOrgID + ",'"+ HProcNumber + "'", "h_p_CJGXPLHB_Query");
               
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {

 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;
                }


@@ -1834,11 +1840,11 @@
        #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 +1960,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 +2072,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]