Index: ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java =================================================================== diff -u -r26820 -r26824 --- ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java (.../UseRecordManagerTests.java) (revision 26820) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java (.../UseRecordManagerTests.java) (revision 26824) @@ -2426,6 +2426,7 @@ objectDao.save(foreignTousseApplication); TousseDefinition foreignTousseDefinition = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("Test骨钩"); + // 解决单元测试报错:Found shared references to a collection error foreignTousseDefinition.setStorageLocationList(null); TousseDefinition newForeignTousseDefinition = new TousseDefinition(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/StorageLocationTableManager.java =================================================================== diff -u -r26798 -r26824 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/StorageLocationTableManager.java (.../StorageLocationTableManager.java) (revision 26798) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/StorageLocationTableManager.java (.../StorageLocationTableManager.java) (revision 26824) @@ -431,25 +431,25 @@ if (rows.size() + 1 > pageSize) { continue; } - String tousseNameRS = rs.getString(1); - String sterileEndTime = rs.getString(2); + String tousseNameRS = rs.getString("tousseName"); + String sterileEndTime = rs.getString("sterileEndTime"); if (StringUtils.isNotBlank(sterileEndTime)) { Date date1 = sdf.parse(sterileEndTime); sterileEndTime = sdf.format(date1); } - String validUntil = rs.getString(3); + String validUntil = rs.getString("validUntil"); if (StringUtils.isNotBlank(validUntil)) { Date date2 = sdf.parse(validUntil); validUntil = sdf.format(date2); } - String tousseBarcode = rs.getString(4); - String barcodeRS = rs.getString(5); - String storageLocationName = rs.getString(6); - String parentName = rs.getString(7); - String wareHouseName = rs.getString(8); - String orgUnitName = rs.getString(9); - String parentStorageLocationId = rs.getString(10); - String storageLocationCode = rs.getString(12); + String tousseBarcode = rs.getString("tousseBarcode"); + String barcodeRS = rs.getString("barcode"); + String storageLocationName = rs.getString("storageLocationName"); + String parentName = rs.getString("parentLocation"); + String wareHouseName = rs.getString("wareHouseName"); + String orgUnitName = rs.getString("orgUnitName"); + String storageLocationId = rs.getString("id"); + String storageLocationCode = rs.getString("storageLocationCode"); JSONObject obj = new JSONObject(); obj.put("tousseName", tousseNameRS); obj.put("sterileEndTime", sterileEndTime); @@ -460,7 +460,7 @@ obj.put("parentName", parentName); obj.put("wareHouseName", wareHouseName); obj.put("orgUnitName", orgUnitName); - obj.put("parentStorageLocationPath", parentStorageLocationId); + obj.put("parentStorageLocationPath", storageLocationId); obj.put("storageLocationCode", storageLocationCode); rows.add(obj); }