解决商品出入库明细时间排序的问题

src/main/java/com/jsh/dao/materials/DepotItemDAO.java

@@ -128,11 +128,12 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
 		//多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便
 		Query query;
 		StringBuffer queryString = new StringBuffer();
-		queryString.append("select dh.Number,concat(dh.SubType,dh.Type) as newType,di.BasicNumber,date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='入库' ");
-		queryString.append(" and MaterialId ="+ MId);
-		queryString.append(" union all ");
-		queryString.append("select dh.Number,concat(dh.SubType,dh.Type) as newType,0-di.BasicNumber,date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='出库' ");
-		queryString.append(" and SubType!='调拨' and SubType!='礼品充值' and MaterialId ="+ MId);
+		queryString.append("select dh.Number,concat(dh.SubType,dh.Type) as newType, " +
+				"case when type='入库' then di.BasicNumber when type='出库' then 0-di.BasicNumber else 0 end as b_num, " +
+				"date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime " +
+				"from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type!='其它' " +
+				"and SubType!='调拨' and SubType!='礼品充值' ");
+		queryString.append(" and MaterialId ="+ MId +" ORDER BY oTime desc ");
 		query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
 		pageUtil.setTotalCount(query.list().size());
 		// 分页查询