Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r21858 -r21878 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 21858) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 21878) @@ -1083,11 +1083,11 @@ if (dbConnection.isSqlServer()) { sql = "select * from (select top 1 d.cost from DisposableGoodsBatchStock d where d.disposableGoodsId = " + disposableGoods.getId() - + " and storage > 0 order by d.id asc) as temp"; + + " and storage > 0 order by d.id desc) as temp"; } else if (dbConnection.isOracle()) { sql = "select * from (select d.cost from DisposableGoodsBatchStock d where d.disposableGoodsId = " + disposableGoods.getId() - + " and storage > 0 order by d.id asc) where rownum =1"; + + " and storage > 0 order by d.id desc) where rownum =1"; } ResultSet rs = objectDao.executeSql(sql); Double returnValue = null; Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java =================================================================== diff -u -r21848 -r21878 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 21848) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 21878) @@ -252,7 +252,7 @@ public List getDisposableGoodsByKeyword(String keyword); /** - * 获取一次性物品定义的价格(以最后入库的批次为准,如果没有就以一次性物品定义的参考价为准). + * 获取一次性物品定义的价格(以最后入库并且有库存大于0的那一个批次为准,如果没有就以一次性物品定义的参考价为准). * @param disposableGoods 一次性物品 * @return */