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

yangle

2024-09-10 8e6b791ea1981d9e4386b99dcbe70a96bfd21ae2

 WebAPI/Controllers/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillController.cs

@@ -1726,6 +1726,9 @@
            public string HName;
            public DateTime HBeginDate;
            public DateTime HEndDate;
            public string HProcName;
            public string HEquipName;
            public string HBactNo;
        }
        [Route("Sc_QualityReportBill/getSc_QualityReportBillDay")]
        [HttpGet]
@@ -1744,7 +1747,7 @@
                    return objJsonResult;
                }
                ReportWorkDemandPlanBill Report = JsonConvert.DeserializeObject<ReportWorkDemandPlanBill>(sWhere);
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMain  '{Report.HBeginDate}','{Report.HEndDate}','{Report.HNumber}','{Report.HName}'", "h_p_Sc_StationOutBillMain");
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMain  '{Report.HBeginDate}','{Report.HEndDate}','{Report.HNumber}','{Report.HName}','{Report.HProcName}','{Report.HEquipName}','{Report.HBactNo}'", "h_p_Sc_StationOutBillMain");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1778,6 +1781,8 @@
            public string HYear;
            public string HWorkCenter;
            public string HName;
            public DateTime HBeginDate;
            public DateTime HEndDate;

        }
        [Route("Sc_QualityReportBill/getSc_QualityReportBillMonth")]
@@ -1797,7 +1802,7 @@
                    return objJsonResult;
                }
                ReportWorkDemandPlanBill1 Report = JsonConvert.DeserializeObject<ReportWorkDemandPlanBill1>(sWhere);
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMonth  '{Report.HYear}','{Report.HWorkCenter}','{Report.HName}'", "h_p_Sc_StationOutBillMonth");
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMonth  '{Report.HYear}','{Report.HWorkCenter}','{Report.HName}', '{Report.HBeginDate}','{Report.HEndDate}'", "h_p_Sc_StationOutBillMonth");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1827,9 +1832,9 @@

        #region ç‰©æ–™ç”Ÿäº§è‰¯çŽ‡ç»Ÿè®¡(斯莫尔) æŸ¥è¯¢

        [Route("Sc_QualityReportBill/getSc_HMater_Yield_Statistics")]
        [Route("Sc_QualityReportBill/getSc_HMaterYieldStatistics")]
        [HttpGet]
        public object getSc_HMater_Yield_Statistics(string sWhere, string user)
        public object getSc_HMaterYieldStatistics(string sWhere, string user)
        {
            try
            {
@@ -1883,9 +1888,9 @@

        #region ä»»åŠ¡å•é€šè¿‡çŽ‡(斯莫尔) æŸ¥è¯¢

        [Route("Sc_QualityReportBill/getSc_HICMMater_Statistics")]
        [Route("Sc_QualityReportBill/getSc_HICMMaterStatistics")]
        [HttpGet]
        public object getSc_HICMMater_Statistics(string sWhere, string user)
        public object getSc_HICMMaterStatistics(string sWhere, string user)
        {
            try
            {