Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r16759 -r16762
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16759)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16762)
@@ -295,6 +295,8 @@
 		disinfectionTousse.setIsCleanedEntirely("否");
 		disinfectionTousse.setIsRecycling(TousseDefinition.STR_YES);
 		objectDao.save(disinfectionTousse);
+		disinfectionTousse.setAncestorID(disinfectionTousse.getId());
+		objectDao.saveOrUpdate(disinfectionTousse);
 	}
 	
 	
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java
===================================================================
diff -u -r16709 -r16762
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java	(.../TestPDADisinfectGoodsInvoiceManager.java)	(revision 16709)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java	(.../TestPDADisinfectGoodsInvoiceManager.java)	(revision 16762)
@@ -1,8 +1,10 @@
 package test.forgon.disinfectsystem.invoicemanager.service;
 import static org.testng.Assert.*;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import net.sf.json.JSONArray;
@@ -20,6 +22,8 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
+import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
+import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 
 public class TestPDADisinfectGoodsInvoiceManager extends AbstractCSSDTest {
 
@@ -32,8 +36,52 @@
 	 */
 	private void createDisifectGoodsApplication(){
 		Map<String, Integer> appMap = new HashMap<String, Integer>();
-		appMap.put("（妇产科护士）止血带",3);
-		createSimpleTousseOrDiposableGoodsApplicationByParam("2014101600001", InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM, "妇产科护士", "3266", new Date(), appMap);
+//		createSimpleTousseOrDiposableGoodsApplicationByParam("2014101600001", InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM, "妇产科护士", "3266", new Date(), appMap);
+		RecyclingApplication application = new RecyclingApplication();
+		application.setSerialNumber("2014101600001");
+		application.setApplicant("吴启华");
+		application.setDepartCoding("3266");
+		application.setDepart("妇产科护士");
+		application.setSettleAccountsDepartCoding("3266");
+		application.setSettleAccountsDepart("妇产科护士");
+		application.setHandleDepart(Constants.ORG_UNIT_NAME_CSSD);
+		application.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD);
+		application.setApplicationTime(new Date());
+		application.setCommittedStatus(true);
+		application.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
+		application.setType(InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM);
+		objectDao.saveOrUpdate(application);
+		///
+		TousseDefinition disinfectionTousse = tousseDefinitionManager.getTousseDefinitionByName("止血带_20141016");
+		for(String barcode : barcodeArray1){
+			TousseInstance tousseInstance = new TousseInstance();
+			tousseInstance.setTousseDefinition(disinfectionTousse);
+			tousseInstance.setTousseName(disinfectionTousse.getName());
+			tousseInstance.setBarcode(barcode);
+			tousseInstance.setType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
+			tousseInstance.setStatus(TousseInstance.STATUS_DISINFECTED);
+			tousseInstance.setPrice(3.5);
+			tousseInstance.setFluctuationPrice(3.5);
+			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT);
+			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT);
+			tousseInstance.setStatisticsAmount(10);
+			tousseInstance.setPackageType("胶带");
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_DISINFECT);
+			tousseInstanceManager.saveOrUpdate(tousseInstance);
+			tousseStockManager.increaseStockByTousseName(tousseInstance.getTousseName());
+		}
+		///
+		List<TousseItem> items = new ArrayList<TousseItem>();
+		TousseItem item = new TousseItem();
+		item.setTousseName(disinfectionTousse.getName());
+		item.setTousseDefinitionId(disinfectionTousse.getId());
+		item.setAmount(3);
+		item.setDiposable("否");
+		item.setInvoicePlan(application);
+		items.add(item);
+		tousseItemManager.saveOrUpdate(item);
+		application.setApplicationItems(items);
+		objectDao.saveOrUpdate(application);
 	}
 	
 	/**
@@ -44,7 +92,7 @@
 		for(String barcode : barcodeArray1){
 			TousseInstance tousseInstance = new TousseInstance();
 			tousseInstance.setTousseDefinition(disinfectionTousse);
-			tousseInstance.setTousseName("（妇产科护士）止血带");
+			tousseInstance.setTousseName(disinfectionTousse.getName());
 			tousseInstance.setBarcode(barcode);
 			tousseInstance.setType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
 			tousseInstance.setStatus(TousseInstance.STATUS_DISINFECTED);
@@ -63,57 +111,29 @@
 	@Test
 	public void testSendAllDisifectGoods(){
 		prepareData();
-		///
 		WareHouse wareHouse_CSSD = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD);
 		assertNotNull(wareHouse_CSSD);
 		JSONObject params = new JSONObject();
 		JSONArray invoiceItems1 = new JSONArray();
 		
+		JSONObject invoiceItems1_1 = new JSONObject();
+		invoiceItems1_1.put("barcode", "201410160001");
+		invoiceItems1_1.put("sendAmount", 3);
+		invoiceItems1_1.put("isRoutine", TousseInstance.ROUTINE_YES);
+		invoiceItems1.add(invoiceItems1_1);
 		
-		{
-			String barcode = "201410150001";
-			JSONObject invoiceItems1_1 = new JSONObject();
-			invoiceItems1_1.put("barcode", barcode);
-			invoiceItems1_1.put("sendAmount", 1);
-			invoiceItems1_1.put("isRoutine", TousseInstance.ROUTINE_YES);
-			
-			invoiceItems1_1.put("tousseType", DisposableGoods.TYPE_NAME);
-			
-			JSONObject typeInfoOnScanned = new JSONObject();
-			
-			DisposableGoodsBatchStock disposableGoodsBatchStock = diposableGoodsManager.getByWarehouseIDAndBarcode(wareHouse_CSSD.getId(), barcode);
-			///
-			typeInfoOnScanned.put("disposableGoodsId", disposableGoodsBatchStock.getDisposableGoodsId());
-			typeInfoOnScanned.put("disposableGoodsStockId", disposableGoodsBatchStock.getDisposableGoodsStockId());
-			typeInfoOnScanned.put("disposableGoodsBatchId", disposableGoodsBatchStock.getDisposableGoodsBatchId());
-			typeInfoOnScanned.put("disposableGoodsBatchStockId", disposableGoodsBatchStock.getId());
-//			if(StringUtils.equals(tousseType,DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS)){
-//				typeInfoOnScanned.put("expensiveDisposablegoodsId", null);
-//			}
-			invoiceItems1_1.put("sendAmount", 500);
-			invoiceItems1_1.put("isRoutine", TousseInstance.ROUTINE_YES);
-			invoiceItems1_1.put("typeInfoOnScanned", typeInfoOnScanned);
-			invoiceItems1.add(invoiceItems1_1);
-		}
-//		map.put("201410150001" , 500);//一次性物品发500个
-		
 		params.put("mode", "depart");
 		params.put("departCode", "3266");
 		params.put("assistantSender", "朱广兴");
 		params.put("sender", "朱广兴");
 		params.put("invoiceItems", invoiceItems1);
 		params.put("sourceWarehouseId", wareHouse_CSSD.getId());
 		params.put("sourceWarehouseName", wareHouse_CSSD.getName());
-		///
-		map.put("201410160001", 3);
-		map.put("departCode", "3266");
-		String jsonStr = createSendOutParam(map);
-//		SendDisifectGoods(jsonStr, testAll);
+		webServiceManager.submitInvoicePlans(params.toString());
 		
 		//浮动价格
 		double tousseFluctionPrice = supplyRoomConfigManager.getTousseFluctuationPercent();
 		
-		webServiceManager.submitInvoicePlans(jsonStr);
 		//发货单
 		Invoice invoice = (Invoice)objectDao.getByProperty(Invoice.class.getSimpleName(), "invoicePlan.serialNumber", "2014101600001");
 		
@@ -143,7 +163,7 @@
 		//创建消毒物品申请单
 		createDisifectGoodsApplication();
 		//创建消毒物品器械包并增加库存
-		createDisifectGoodsInstanceAndAddStroge();
+//		createDisifectGoodsInstanceAndAddStroge();
 	}
 	
 }