Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r13035 -r13042
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 13035)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 13042)
@@ -749,9 +749,10 @@
 		
 		objectDao.excuteSQL("delete from DisposableGoodsStock");
 		
-		objectDao.excuteSQL("delete from DisposableGoods");
 		objectDao.excuteSQL("delete from DisposableGoodsBatch");
+		objectDao.excuteSQL("delete from DisposableGoods");
 		
+		
 		//objectDao.excuteSQL("delete from DataDirectory_GYEY_COST_ACCOUNTING");
 		
 		objectDao.excuteSQL("delete from OrgUserRelation");
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java
===================================================================
diff -u -r13038 -r13042
--- ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java	(.../DiposableGoodsManagerTests.java)	(revision 13038)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java	(.../DiposableGoodsManagerTests.java)	(revision 13042)
@@ -3,12 +3,8 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -17,6 +13,7 @@
 import org.testng.annotations.Test;
 
 import test.forgon.disinfectsystem.AbstractCSSDTest;
+import test.forgon.disinfectsystem.ExpectedException;
 
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
@@ -472,7 +469,7 @@
 	}
 	
 	// 测试出库，库存数量小于出库数量，不够出库，执行后库存应保持不变
-	@Test
+	@Test(expectedExceptions={ExpectedException.class})
 	public void testOutStorageWhenStorageLessThanOutAmount(){
 		initCSSDData();
 		Map<String, Object> result = new HashMap<String, Object>();
@@ -503,17 +500,28 @@
 		godownEntryItem21.setGodownEntry(entry2);
 		godownEntryItem21.setExpDate(new Date());
 		entry2.getItemsList().add(godownEntryItem21);
+		
 		try {
-			godownEntryManager.saveGodownOutEntry_TRANS_NEW(entry2, result);
+//			godownEntryManager.saveGodownOutEntry_TRANS_NEW(entry2, result);
+			godownEntryManager.saveGodownOutEntry_TRANS_REQUIRED(entry2, result);
 		} catch (Exception e) {
 			e.printStackTrace();
+			throw new ExpectedException();
 		}
 		
-		goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML");
+//		goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML");
+//		assertNotNull(goods);
+//		assertEquals(1000, goods.getAmount().intValue());
+	}
+	
+	@Test(dependsOnMethods = { "testOutStorageWhenStorageLessThanOutAmount" },alwaysRun=true)
+	public void testOutStorageWhenStorageLessThanOutAmount_assert(){
+		WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD");
+		assertNotNull(wareHouse1);
+		DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML");
 		assertNotNull(goods);
 		assertEquals(1000, goods.getAmount().intValue());
 	}
-	
 	// 测试出库，库存数量大于发货数量，正常发货
 	@Test
 	public void testOutStorageWhenStorageGreaterThanOutAmount(){
@@ -547,42 +555,18 @@
 		godownEntryItem1_1.setExpDate(new Date());
 		entry1.getItemsList().add(godownEntryItem1_1);
 		try {
-			godownEntryManager.saveGodownOutEntry_TRANS_NEW(entry1, result);
+//			godownEntryManager.saveGodownOutEntry_TRANS_NEW(entry1, result);
+			godownEntryManager.saveGodownOutEntry_TRANS_REQUIRED(entry1, result);
+			
 		} catch (Exception e) {
 			e.printStackTrace();
+//			throw new ExpectedException();
 		}
 		
 		goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML");
 		assertNotNull(goods);
 		assertEquals(500, goods.getAmount().intValue());
 		
-		GodownEntry entry2 = new GodownEntry();
-		entry2.setWarehouseID(warehouseID);
-		entry2.setWarehouseName(warehouseName);
-		GodownEntryItem godownEntryItem2_1 = new GodownEntryItem();
-		godownEntryItem2_1.setBatchNumber("b-20000101");
-		godownEntryItem2_1.setAmount(600L);
-		godownEntryItem2_1.setCost(1.5);
-		godownEntryItem2_1.setDisposableGoodsID(goods.getDisposableGoodsID());
-		godownEntryItem2_1.setDisposableGoodsStockID(goods.getId());
-		godownEntryItem2_1.setDisposableGoodsBatchID(disposableGoodsBatchStock.getDisposableGoodsBatchID());
-		godownEntryItem2_1.setDisposableGoodsBatchStockID(disposableGoodsBatchStock.getId());
-		godownEntryItem2_1.setManufacturer("广州白云山制药厂");
-		godownEntryItem2_1.setSupplierName("广州捷康医疗");
-		godownEntryItem2_1.setGodownEntry(entry2);
-		godownEntryItem2_1.setExpDate(new Date());
-		entry2.getItemsList().add(godownEntryItem2_1);
-		try {
-			godownEntryManager.saveGodownOutEntry_TRANS_NEW(entry2, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML");
-		objectDao.getHibernateSession().refresh(goods);
-		assertNotNull(goods);
-		assertEquals(500, goods.getAmount().intValue());
-		
 	}
 	
 	// 高强度并发测试，并且数据随机生成。TODO
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/ExpectedException.java
===================================================================
diff -u
--- ssts-web/src/test/java/test/forgon/disinfectsystem/ExpectedException.java	(revision 0)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/ExpectedException.java	(revision 13042)
@@ -0,0 +1,12 @@
+/**
+ * 
+ */
+package test.forgon.disinfectsystem;
+
+/**
+ * @author jeffli
+ *
+ */
+public class ExpectedException extends RuntimeException {
+
+}