Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r17655 -r17656 --- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17655) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17656) @@ -2101,32 +2101,36 @@ tousseDefinition2.getMaterialInstances().add(materialInstance55); tousseDefinition2.getMaterialInstances().add(materialInstance66); tousseDefinitionManager.saveOrUpdate(tousseDefinition2); - //为“Test开颅包”绑定一个标识牌,并且有四个标识牌实例 + //为“Test开颅包”绑定3个标识牌 IDCardDefinition iDCardDefinition1 = new IDCardDefinition(); iDCardDefinition1.setTousseDefinitionID(tousseDefinition2.getId()); - iDCardDefinition1.setCurIdCardInstanceBarcode("010316313"); + iDCardDefinition1.setCurIdCardInstanceBarcode("010316310"); objectDao.saveOrUpdate(iDCardDefinition1); IDCardInstance iDCardInstance1 = new IDCardInstance(); iDCardInstance1.setIdCardDefinitionID(iDCardDefinition1.getId()); iDCardInstance1.setBarcode("010316310"); + objectDao.saveOrUpdate(iDCardInstance1); + IDCardDefinition iDCardDefinition2 = new IDCardDefinition(); + iDCardDefinition2.setTousseDefinitionID(tousseDefinition2.getId()); + iDCardDefinition2.setCurIdCardInstanceBarcode("010316320"); + objectDao.saveOrUpdate(iDCardDefinition2); + IDCardInstance iDCardInstance2 = new IDCardInstance(); - iDCardInstance2.setIdCardDefinitionID(iDCardDefinition1.getId()); - iDCardInstance2.setBarcode("010316311"); + iDCardInstance2.setIdCardDefinitionID(iDCardDefinition2.getId()); + iDCardInstance2.setBarcode("010316320"); + objectDao.saveOrUpdate(iDCardInstance2); - IDCardInstance iDCardInstance3 = new IDCardInstance(); - iDCardInstance3.setIdCardDefinitionID(iDCardDefinition1.getId()); - iDCardInstance3.setBarcode("010316312"); + IDCardDefinition iDCardDefinition3 = new IDCardDefinition(); + iDCardDefinition3.setTousseDefinitionID(tousseDefinition2.getId()); + iDCardDefinition3.setCurIdCardInstanceBarcode("010316330"); + objectDao.saveOrUpdate(iDCardDefinition3); - IDCardInstance iDCardInstance4 = new IDCardInstance(); - iDCardInstance4.setIdCardDefinitionID(iDCardDefinition1.getId()); - iDCardInstance4.setBarcode("010316313"); - - objectDao.saveOrUpdate(iDCardInstance1); - objectDao.saveOrUpdate(iDCardInstance2); + IDCardInstance iDCardInstance3 = new IDCardInstance(); + iDCardInstance3.setIdCardDefinitionID(iDCardDefinition3.getId()); + iDCardInstance3.setBarcode("010316330"); objectDao.saveOrUpdate(iDCardInstance3); - objectDao.saveOrUpdate(iDCardInstance4); TousseDefinition tousseDefinition3 = new TousseDefinition(); tousseDefinition3.setName("Test开口包");