Merge branch 'master' of http://60.12.218.120:8083/wufan/ERP

TradeManageNew/DataNew.cs

@@ -7245,8 +7245,8 @@ inner join DT_OrderGoods g on a.OrderId=g.OrderId
 inner join HW_GoodsDetail e on g.DetailId=e.DetailId
 left Join DT_Fees b with(nolock) on a.OrderId=b.orderid
 where a.State>0 and c.StoreId in (6,9,11)   and  a.State<3 and a.PlatId=23)t group by GoodsId)  Gr on a.GoodsId=Gr.GoodsId
-) t
-where 1=1   " + sqlPage + where + " order by GoodsHJNum desc ";
+ where 1=1 "+ where + @") t
+where 1=1   " + sqlPage  + " order by GoodsHJNum desc ";
             Database db = DatabaseFactory.CreateDatabase();
             DbCommand cmd = db.GetSqlStringCommand(tsql);