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

chenhaozhe

2 天以前 da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a

 WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs

@@ -170,12 +170,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xs_SellOutCompareToProductReport order by 生产单号 desc", "h_v_Xs_SellOutCompareToProductReport");
                    ds = oCN.RunProcReturn("select * from h_v_Xs_SellOutCompareToProductReport order by 日期 desc", "h_v_Xs_SellOutCompareToProductReport");
                }
                else
                {
                    string sql1 = "select * from h_v_Xs_SellOutCompareToProductReport where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 生产单号 desc";
                    string sql = sql1 + sWhere + " order by 日期 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xs_SellOutCompareToProductReport");
                }