Index: ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ForeignTousseAppDataProvider.java =================================================================== diff -u -r21808 -r40511 --- ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ForeignTousseAppDataProvider.java (.../ForeignTousseAppDataProvider.java) (revision 21808) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ForeignTousseAppDataProvider.java (.../ForeignTousseAppDataProvider.java) (revision 40511) @@ -43,6 +43,8 @@ foreignTousseApplication.setCommittedStatus(true); foreignTousseApplication.setClinicNumber("0100006"); foreignTousseApplication.setApplicationTime(new Date()); + foreignTousseApplication.setApplicant("oruser1"); + foreignTousseApplication.setApplicantCode("oruser1"); return foreignTousseApplication; } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java =================================================================== diff -u -r28883 -r40511 --- ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java (.../RecyclingErrorAndDamageTests.java) (revision 28883) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java (.../RecyclingErrorAndDamageTests.java) (revision 40511) @@ -208,7 +208,7 @@ record.setStatus(RecyclingRecord.STATUS_CONFIRMED); objectDao.saveOrUpdate(record); - assertEquals(task_开胸包.getStatus(), tousseMaterialsLostMustConfirm?PackingTask.STATUS_AWAIT_VERIFYING:PackingTask.STATUS_AWAIT_PACKING); + assertEquals(task_开胸包.getStatus(), PackingTask.STATUS_AWAIT_PACKING); task_开胸包.setStatus(PackingTask.STATUS_AWAIT_PACKING); objectDao.saveOrUpdate(task_开胸包); @@ -295,7 +295,7 @@ record.setStatus(RecyclingRecord.STATUS_CONFIRMED); objectDao.saveOrUpdate(record); - assertEquals(task_开胸包.getStatus(), tousseMaterialsLostMustConfirm?PackingTask.STATUS_AWAIT_VERIFYING:PackingTask.STATUS_AWAIT_PACKING); + assertEquals(task_开胸包.getStatus(), PackingTask.STATUS_AWAIT_PACKING); task_开胸包.setStatus(PackingTask.STATUS_AWAIT_PACKING); objectDao.saveOrUpdate(task_开胸包); @@ -381,7 +381,7 @@ record.setStatus(RecyclingRecord.STATUS_CONFIRMED); objectDao.saveOrUpdate(record); - assertEquals(task_开胸包.getStatus(), tousseMaterialsLostMustConfirm?PackingTask.STATUS_AWAIT_VERIFYING:PackingTask.STATUS_AWAIT_PACKING); + assertEquals(task_开胸包.getStatus(), PackingTask.STATUS_AWAIT_PACKING); task_开胸包.setStatus(PackingTask.STATUS_AWAIT_PACKING); objectDao.saveOrUpdate(task_开胸包); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java =================================================================== diff -u -r26269 -r40511 --- ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java (.../MaterialEntryManagerTests.java) (revision 26269) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java (.../MaterialEntryManagerTests.java) (revision 40511) @@ -620,9 +620,10 @@ } /** + * 系统不允许删除入库单,只能添加退库单进行退库 * 测试删除材料入库单 */ - @Test + //@Test public void testDeleteMaterialEntry() throws Exception{ prepare(); //3.准备材料 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java =================================================================== diff -u -r31795 -r40511 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java (.../TestRecyclingApplication.java) (revision 31795) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java (.../TestRecyclingApplication.java) (revision 40511) @@ -1386,6 +1386,8 @@ foreignTousseApplication.setCommittedStatus(true); foreignTousseApplication.setClinicNumber("0100006"); foreignTousseApplication.setApplicationTime(new Date()); + foreignTousseApplication.setApplicant("oruser1"); + foreignTousseApplication.setApplicantCode("oruser1"); List tousseItemList = new ArrayList(); TousseItem tousse = new TousseItem(); tousse.setTousseName("测试外来器械包"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java =================================================================== diff -u -r28900 -r40511 --- ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java (.../TestDisinfectGoodsSteriliManager.java) (revision 28900) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java (.../TestDisinfectGoodsSteriliManager.java) (revision 40511) @@ -819,6 +819,7 @@ objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 10); for(TousseInstance tousseInstance : tousseInstanceList){ + objectDao.refresh(tousseInstance); assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_DISINFECTED); } } @@ -988,6 +989,7 @@ objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 10); for(TousseInstance tousseInstance : tousseInstanceList){ + objectDao.refresh(tousseInstance); assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_REVIEWED); }