Index: ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java =================================================================== diff -u -r19145 -r19156 --- ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java (.../MaterialEntryManagerTests.java) (revision 19145) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java (.../MaterialEntryManagerTests.java) (revision 19156) @@ -232,7 +232,7 @@ * 盘点断言 */ public void takeStockAssertion(){ - List inventoryItems = inventoryRecordManager.getInventoryItems(recordId()); + List inventoryItems = inventoryRecordManager.getAllInventoryItem(recordId()); assertNotNull(inventoryItems); Integer storageDifference = null; Double infoPrice = null ;//用来判断什么时候退出循环 Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java =================================================================== diff -u -r19145 -r19156 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 19145) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 19156) @@ -768,8 +768,13 @@ String sql = "where po.inventoryRecordId = " + inventoryRecordId + " order by po.externalCode asc"; return objectDao.findBySql(InventoryItem.class.getSimpleName(), sql); } - + @Override + public List getAllInventoryItem(String inventoryRecordId){ + String sql = "where po.inventoryRecordId = " + inventoryRecordId + " order by po.price asc"; + return objectDao.findBySql(InventoryItem.class.getSimpleName(), sql); + } + @Override public void deleteInventoryRecords(String ids) { if(StringUtils.isNotBlank(ids)){ String [] idArray = ids.split(";"); Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java =================================================================== diff -u -r19145 -r19156 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java (.../InventoryRecordManager.java) (revision 19145) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java (.../InventoryRecordManager.java) (revision 19156) @@ -19,6 +19,10 @@ public List getInventoryRecord(); public List getInventoryItems(String inventoryRecordId); + /** + * 根据inventoryRecordId获取对应的InventoryItem信息 + */ + public List getAllInventoryItem(String inventoryRecordId); public void addInventoryRecord(String params) throws Exception;