Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r12386 -r12583 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 12386) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 12583) @@ -33,6 +33,7 @@ import com.forgon.attachfile.service.AttachFileManager; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; +import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoods; import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance; @@ -494,8 +495,7 @@ } } - List> diposableGoodsList = getDiposableGoodsList( - sql, true); + List> diposableGoodsList = getDiposableGoodsList(sql,true); Map map = new HashMap(); map.put("totalCount", diposableGoodsList.size()); @@ -505,8 +505,7 @@ } @SuppressWarnings("unchecked") - public List> getDiposableGoodsList(String sql, - boolean displayPrice) { + public List> getDiposableGoodsList(String sql,boolean showReferencePrice) { List diposableGoods = objectDao.findBySql( DiposableGoods.class.getSimpleName(), sql); List> mapList = new ArrayList>(); @@ -540,7 +539,8 @@ String displayName = goodsName + "(库存:" + diposableGood.getAmount() + ")"; - if (displayPrice) { + + if (showReferencePrice) { temp.put("referencePrice", diposableGood.getReferencePrice()); // 价格修改为浮动价格 @@ -560,7 +560,7 @@ + "(参考价:" + price + ")(库存:" + diposableGood.getAmount() + ")"; } - + temp.put("displayName", displayName); mapList.add(temp); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java =================================================================== diff -u -r12332 -r12583 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 12332) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 12583) @@ -50,7 +50,7 @@ public void updateDiposableGoodsPriceFromExcelFile(); - public List> getDiposableGoodsList(String sql, boolean displayPrice); + public List> getDiposableGoodsList(String sql,boolean showReferencePrice); public DiposableGoods getDiposableGoodsByInventorySerialNumber(String inventorySerialNumber); ///////////////