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

zrg

2024-05-30 d5d413bc8926c46601ad917a5b085d4339e3ccd1

 WebAPI/Controllers/CGGL/YF_PayMentBillController.cs

@@ -1053,7 +1053,7 @@
        /// </summary>
        [Route("YF_PayMentBill/GetCg_POInStockBillSumReport")]
        [HttpGet]
        public object GetCg_POInStockBillSumReport(string sWhere, string user, string userid)
        public object GetCg_POInStockBillSumReport(string sWhere, string user)
        {
            try
            {
@@ -1072,12 +1072,12 @@
                //查询
                if (sWhere == null || sWhere.Equals(""))
                {
                    string sql = "exec h_p_Cg_POInStockBillSumReport '','" + userid + "'";
                    string sql = "exec h_p_Cg_POInStockBillSumReport ''";
                    ds = oCN.RunProcReturn(sql, "h_p_Cg_POInStockBillSumReport");
                }
                else
                {
                    string sql = "exec h_p_Cg_POInStockBillSumReport  '" + sWhere + "','" + userid + "'";
                    string sql = "exec h_p_Cg_POInStockBillSumReport  '" + sWhere + "'";
                }

                //添加列名
@@ -1109,24 +1109,14 @@
        #region 采购业务/订单报统计表 查询
        [Route("YF_PayMentBill/Cg_POOrderBillSumReport")]
        [HttpGet]
        public object Cg_POOrderBillSumReport(string DateYear, string HType, string user)
        public object Cg_POOrderBillSumReport(string sWhere, string user)
        {
            try
            {
                DataSet ds;
                List<object> columnNameList = new List<object>();

                if (DateYear == null || DateYear.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择有效年份";
                    return objJsonResult;
                }
                else
                {
                    ds = oCN.RunProcReturn("exec [h_p_Cg_POOrderBillSumReport] '" + DateYear + "','" + HType + "'", "[h_p_Cg_POMaterialPriceReport]");
                }
                ds = oCN.RunProcReturn("exec [h_p_Cg_POOrderBillSumReport] '" + sWhere + "'", "[h_p_Cg_POMaterialPriceReport]");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1157,24 +1147,14 @@
        #region 采购价格分析表  查询
        [Route("YF_PayMentBill/POMaterialPriceReport")]
        [HttpGet]
        public object POMaterialPriceReport(string DateYear, string HType, string user)
        public object POMaterialPriceReport(string sWhere, string user)
        {
            try
            {
                DataSet ds;
                List<object> columnNameList = new List<object>();

                if (DateYear == null || DateYear.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择有效年份";
                    return objJsonResult;
                }
                else
                {
                    ds = oCN.RunProcReturn("exec [h_p_Cg_POMaterialPriceReport] '" + DateYear + "','" + HType + "'", "[h_p_Cg_POMaterialPriceReport]");
                }
                ds = oCN.RunProcReturn("exec [h_p_Cg_POMaterialPriceReport] '" + sWhere + "'", "[h_p_Cg_POMaterialPriceReport]");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1216,7 +1196,7 @@
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec  h_p_Cg_POOrderBillProcessSumReport    '" + sWhere + "','',''", "h_p_Cg_POOrderBillProcessSumReport");
                ds = oCN.RunProcReturn("exec  h_p_Cg_POOrderBillProcessSumReport    '" + sWhere + "'", "h_p_Cg_POOrderBillProcessSumReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1258,7 +1238,7 @@
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec  h_p_Cg_POOrderReceiveDaySumReport    '" + sWhere + "','',''", "h_p_Cg_POOrderReceiveDaySumReport");
                ds = oCN.RunProcReturn("exec  h_p_Cg_POOrderReceiveDaySumReport    '" + sWhere + "',", "h_p_Cg_POOrderReceiveDaySumReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)