Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryExpensiveGoodsForm.js =================================================================== diff -u -r21060 -r21071 --- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryExpensiveGoodsForm.js (.../inventoryExpensiveGoodsForm.js) (revision 21060) +++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryExpensiveGoodsForm.js (.../inventoryExpensiveGoodsForm.js) (revision 21071) @@ -77,6 +77,7 @@ {name : 'id',mapping : 'id'}, {name : 'name',mapping : 'name'}, {name : 'specification',mapping : 'specification'},//规格 + {name : 'displayName',mapping : 'displayName'},//名称(含规格) {name : 'externalCode',mapping : 'externalCode'}, {name : 'sequence',mapping : 'sequence'}, {name : 'referencePrice',mapping : 'referencePrice'}, @@ -479,7 +480,7 @@ queryParam : 'spell', minChars : 0, valueField : 'id', - displayField : 'name', + displayField : 'displayName', store : expensiveGoodsStore, forceSelection : true, lazyInit : false, Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java =================================================================== diff -u -r21054 -r21071 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java (.../InventoryRecordAction.java) (revision 21054) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java (.../InventoryRecordAction.java) (revision 21071) @@ -1,6 +1,7 @@ package com.forgon.disinfectsystem.inventoryrecord.action; import java.io.IOException; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -196,7 +197,9 @@ inventoryItemObj.put("specification", goods.getSpecification()); inventoryItemObj.put("amount", goods.getStorage()); inventoryItemObj.put("inventoryAmount", goods.getAmount()); - inventoryItemObj.put("cost", goods.getPrice()); + //浮点型转换为两位小数 + BigDecimal bg = new BigDecimal(goods.getPrice()); + inventoryItemObj.put("cost", bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); inventoryItemObj.put("referencePrice", expensiveGoods.getReferencePrice());//临时用的单价(参考价) inventoryItemObj.put("externalCode", goods.getExternalCode()); inventoryItemObj.put("sequence", goods.getSequence());