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

zrg

2024-07-04 0f2de16745f1b282a5af5e27005a027ccd1e86ce

 WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs

@@ -111,12 +111,12 @@
                //查询
                if (sWhere == null || sWhere.Equals(""))
                {
                    string sql = "exec h_p_Xs_CusBalanceReport_Query '','" + userid + "'";
                    string sql = "exec h_p_Xs_CusBalanceReport_HIsUsingBalanceEntry_Query '','" + userid + "'," + HCusID;
                    ds = oCN.RunProcReturn(sql, "h_p_Xs_CusBalanceReport_Query");
                }
                else
                {
                    string sql = "exec h_p_Xs_CusBalanceReport_Query '" + sWhere + "','" + userid + "'";
                    string sql = "exec h_p_Xs_CusBalanceReport_HIsUsingBalanceEntry_Query '" + sWhere +"','" + userid + "'," + HCusID;
                    ds = oCN.RunProcReturn(sql, "h_p_Xs_CusBalanceReport_Query");
                }