Index: ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java
===================================================================
diff -u -r17817 -r17828
--- ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java	(.../TestDisinfectGoodsSteriliManager.java)	(revision 17817)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java	(.../TestDisinfectGoodsSteriliManager.java)	(revision 17828)
@@ -6,7 +6,6 @@
 import static org.testng.Assert.assertTrue;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -19,7 +18,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.Rollback;
 import org.testng.annotations.Test;
 
 import test.forgon.constant.Constants;
@@ -33,26 +31,20 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
-import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
-import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.packing.PackingTask;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
-import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial;
-import com.forgon.disinfectsystem.invoicemanager.vo.ScanGoodsVo;
 import com.forgon.disinfectsystem.packing.dwr.table.PackingTableManager;
 import com.forgon.disinfectsystem.packing.service.PackingManager;
 import com.forgon.disinfectsystem.recyclingrecord.service.RecyclingRecordManager;
 import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager;
 import com.forgon.disinfectsystem.vo.TousseItemVo;
 import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 
 /**
  * 通用申请单发货
@@ -198,7 +190,6 @@
 	 * 用例场景:不回收、不装配、不追溯、不审核、不灭菌
 	 * 断言申请后包实例状态、数量等
 	 */
-	@Rollback(false)
 	@Test
 	public void test1(){
 		initData(TousseDefinition.STR_NO,TousseDefinition.STR_NO,
@@ -246,7 +237,6 @@
 	 * 用例场景:回收、不装配、不追溯、不审核、不灭菌
 	 * 断言申请后回收前包实例状态、数量；回收后包实例数量、状态等
 	 */
-	@Rollback(false)
 	@Test
 	public void test2(){
 		initData(TousseDefinition.STR_YES,TousseDefinition.STR_NO,
@@ -330,7 +320,6 @@
 	 * 用例场景:回收、装配、不追溯、不审核、不灭菌
 	 * 断言申请后回收前包实例状态、数量；回收后装配前包实例数量、状态；装配后包实例数量、状态等
 	 */
-	@Rollback(false)
 	@Test
 	public void test3(){
 		initData(TousseDefinition.STR_YES,TousseDefinition.STR_YES,
@@ -487,7 +476,6 @@
 	 * 用例场景:回收、装配、追溯、不审核、不灭菌
 	 * 断言申请后回收前包实例状态、数量；回收后装配前包实例数量、状态；装配后包实例数量、状态等
 	 */
-	@Rollback(false)
 	@Test
 	public void test4(){
 		initData(TousseDefinition.STR_YES,TousseDefinition.STR_YES,
@@ -644,7 +632,6 @@
 	 * 断言申请后回收前包实例状态、数量；回收后装配前包实例数量、状态；装配后审核前包实例数量、状态；审核后包实例数量、状态等
 	 */
 	@Test
-	@Rollback(false)
 	public void test5(){
 		initData(TousseDefinition.STR_YES,TousseDefinition.STR_YES,
 				TousseDefinition.STR_YES,TousseDefinition.STR_YES,TousseDefinition.STR_NO);
@@ -814,7 +801,6 @@
 	 * 用例场景:回收、装配、追溯、审核、灭菌
 	 * 断言申请后回收前包实例状态、数量；回收后装配前包实例数量、状态；装配后审核前包实例数量、状态；审核后灭菌前包实例数量、状态；灭菌后包实例数量、状态等
 	 */
-	@Rollback(false)
 	@Test
 	public void test6(){
 		initData(TousseDefinition.STR_YES,TousseDefinition.STR_YES,