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

yusijie

2025-05-07 377309d01729ca2adf72167157a1029e2327b7c2

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillController.cs

@@ -5751,7 +5751,7 @@
        #region å·¥ç¨‹é¡¹ç›®è´¹ç”¨å¾…审核列表
        [Route("PM_ProjectBill/NeedCheckQuery")]
        [HttpGet]
        public object PM_ProjectBillNeedCheckQuery(string user)
        public object PM_ProjectBillNeedCheckQuery(string user,string sWhere)
        {
            DataSet ds;
            try
@@ -5767,7 +5767,7 @@
                //    return objJsonResult;
                //}
                //sWhere = sWhere.Replace("'", "''");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedCheckQuery ", "h_p_PM_ProjectBillNeedCheckQuery");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedCheckQuery " + sWhere, "h_p_PM_ProjectBillNeedCheckQuery");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -5941,7 +5941,7 @@
        #region å·¥ç¨‹é¡¹ç›®è´¹ç”¨å¾…保存列表
        [Route("PM_ProjectBill/NeedSaveQuery")]
        [HttpGet]
        public object PM_ProjectBillNeedSaveQuery(string user)
        public object PM_ProjectBillNeedSaveQuery(string user,string sWhere)
        {
            DataSet ds;
            try
@@ -5957,7 +5957,7 @@
                //    return objJsonResult;
                //}
                //sWhere = sWhere.Replace("'", "''");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedSaveQuery ", "h_p_PM_ProjectBillNeedSaveQuery");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedSaveQuery "+sWhere, "h_p_PM_ProjectBillNeedSaveQuery");

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